diff --git a/.gitignore b/.gitignore
index 0f42248..72fd917 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@ Release
 *~
 *.bak
 .vs
-
+*.a
diff --git a/DStarRepeater/Makefile b/DStarRepeater/Makefile
index e5c6f2b..67efbe9 100644
--- a/DStarRepeater/Makefile
+++ b/DStarRepeater/Makefile
@@ -9,6 +9,9 @@ dstarrepeater:	$(OBJECTS)
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -c -o $@ $<
 
+install:
+		install -g bin -o root -m 0775 dstarrepeater $(BINDIR)
+
 clean:
 		$(RM) dstarrepeater *.o *.d *.bak *~
 
diff --git a/DStarRepeaterConfig/Makefile b/DStarRepeaterConfig/Makefile
index 186d345..5bd019a 100644
--- a/DStarRepeaterConfig/Makefile
+++ b/DStarRepeaterConfig/Makefile
@@ -13,6 +13,9 @@ dstarrepeaterconfig:	$(OBJECTS)
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../GUICommon -I../Common -c -o $@ $<
 
+install:
+		install -g bin -o root -m 0775 dstarrepeaterconfig $(BINDIR)
+
 clean:
 		$(RM) dstarrepeaterconfig *.o *.d *.bak *~
 
diff --git a/Makefile b/Makefile
index d3ee9c4..827a627 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
-export DATADIR := "/usr/local/etc"
+export DATADIR := "/usr/share/dstarrepeater"
 export LOGDIR  := "/var/log"
 export CONFDIR := "/etc"
+export BINDIR  := "/usr/bin"
 
-export CXX := $(shell wx-config --cxx)
-export CFLAGS := -g -O2 -Wall $(shell wx-config --cxxflags) -DLOG_DIR='$(LOGDIR)' -DCONF_DIR='$(CONFDIR)' -DDATA_DIR='$(DATADIR)'
-export LIBS := $(shell wx-config --libs adv,core) -lasound -lusb-1.0
-export LDFLAGS := -g
+export CXX     := $(shell wx-config --cxx)
+export CFLAGS  := -O2 -Wall $(shell wx-config --cxxflags) -DLOG_DIR='$(LOGDIR)' -DCONF_DIR='$(CONFDIR)' -DDATA_DIR='$(DATADIR)'
+export LIBS    := $(shell wx-config --libs adv,core) -lasound -lusb-1.0
+export LDFLAGS := 
 
 all:	DStarRepeater/dstarrepeater DStarRepeaterConfig/dstarrepeaterconfig
 
@@ -21,6 +22,11 @@ GUICommon/GUICommon.a:
 Common/Common.a:
 	make -C Common
 
+install:	all
+	make -C Data install
+	make -C DStarRepeater install
+	make -C DStarRepeaterConfig install
+
 clean:
 	make -C Common clean
 	make -C GUICommon clean