diff --git a/.gitignore b/.gitignore
index 0f42248..e3bcc9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@ Release
 *~
 *.bak
 .vs
+*.a
 
diff --git a/APRSTransmit/Makefile b/APRSTransmit/Makefile
index ddb4fca..5f45459 100644
--- a/APRSTransmit/Makefile
+++ b/APRSTransmit/Makefile
@@ -8,6 +8,9 @@ aprstransmit:	$(OBJECTS)
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -c -o $@ $<
 
+install:
+		install -g bin -o root -m 0775 aprstransmit $(BINDIR)
+
 clean:
 		$(RM) aprstransmit *.o *.d *.bak *~
 
diff --git a/Data/Makefile b/Data/Makefile
new file mode 100644
index 0000000..4350c30
--- /dev/null
+++ b/Data/Makefile
@@ -0,0 +1,36 @@
+install:
+	install -d -g bin -o root -m 0775 $(DATADIR)
+	install -g bin -o root -m 0664 CCS_Hosts.txt    $(DATADIR)
+	install -g bin -o root -m 0664 DCS_Hosts.txt    $(DATADIR)
+	install -g bin -o root -m 0664 DExtra_Hosts.txt $(DATADIR)
+	install -g bin -o root -m 0664 DPlus_Hosts.txt  $(DATADIR)
+	install -g bin -o root -m 0664 TIME_de_DE.ambe  $(DATADIR)
+	install -g bin -o root -m 0664 TIME_de_DE.indx  $(DATADIR)
+	install -g bin -o root -m 0664 TIME_en_GB.ambe  $(DATADIR)
+	install -g bin -o root -m 0664 TIME_en_GB.indx  $(DATADIR)
+	install -g bin -o root -m 0664 TIME_en_US.ambe  $(DATADIR)
+	install -g bin -o root -m 0664 TIME_en_US.indx  $(DATADIR)
+	install -g bin -o root -m 0664 TIME_fr_FR.ambe  $(DATADIR)
+	install -g bin -o root -m 0664 TIME_fr_FR.indx  $(DATADIR)
+	install -g bin -o root -m 0664 TIME_se_SE.ambe  $(DATADIR)
+	install -g bin -o root -m 0664 TIME_se_SE.indx  $(DATADIR)
+	install -g bin -o root -m 0664 de_DE.ambe $(DATADIR)
+	install -g bin -o root -m 0664 de_DE.indx $(DATADIR)
+	install -g bin -o root -m 0664 dk_DK.ambe $(DATADIR)
+	install -g bin -o root -m 0664 dk_DK.indx $(DATADIR)
+	install -g bin -o root -m 0664 en_GB.ambe $(DATADIR)
+	install -g bin -o root -m 0664 en_GB.indx $(DATADIR)
+	install -g bin -o root -m 0664 en_US.ambe $(DATADIR)
+	install -g bin -o root -m 0664 en_US.indx $(DATADIR)
+	install -g bin -o root -m 0664 es_ES.ambe $(DATADIR)
+	install -g bin -o root -m 0664 es_ES.indx $(DATADIR)
+	install -g bin -o root -m 0664 fr_FR.ambe $(DATADIR)
+	install -g bin -o root -m 0664 fr_FR.indx $(DATADIR)
+	install -g bin -o root -m 0664 it_IT.ambe $(DATADIR)
+	install -g bin -o root -m 0664 it_IT.indx $(DATADIR)
+	install -g bin -o root -m 0664 no_NO.ambe $(DATADIR)
+	install -g bin -o root -m 0664 no_NO.indx $(DATADIR)
+	install -g bin -o root -m 0664 pl_PL.ambe $(DATADIR)
+	install -g bin -o root -m 0664 pl_PL.indx $(DATADIR)
+	install -g bin -o root -m 0664 se_SE.ambe $(DATADIR)
+	install -g bin -o root -m 0664 se_SE.indx $(DATADIR)
diff --git a/Makefile b/Makefile
index 1605144..0c66d82 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
-export DATADIR := "/usr/local/etc"
+export DATADIR := "/usr/share/ircddbgateway"
 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)
-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)
+export LDFLAGS := 
 
 all:	ircDDBGateway/ircddbgateway ircDDBGatewayConfig/ircddbgatewayconfig APRSTransmit/aprstransmit RemoteControl/remotecontrol \
 	StarNetServer/starnetserver TextTransmit/texttransmit TimerControl/timercontrol TimeServer/timeserver VoiceTransmit/voicetransmit
@@ -46,6 +47,18 @@ Common/Common.a:
 ircDDB/IRCDDB.a:
 	make -C ircDDB
 
+install:	all
+	make -C Data install
+	make -C APRSTransmit install
+	make -C ircDDBGateway install
+	make -C RemoteControl install
+	make -C StarNetServer install
+	make -C TextTransmit install
+	make -C TimerControl install
+	make -C TimeServer install
+	make -C VoiceTransmit install
+	make -C ircDDBGatewayConfig install
+
 clean:
 	make -C Common clean
 	make -C ircDDB clean
diff --git a/RemoteControl/Makefile b/RemoteControl/Makefile
index 16e20bf..16fa1cd 100644
--- a/RemoteControl/Makefile
+++ b/RemoteControl/Makefile
@@ -10,6 +10,9 @@ remotecontrol:	$(OBJECTS)
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../GUICommon -c -o $@ $<
 
+install:
+		install -g bin -o root -m 0775 remotecontrol $(BINDIR)
+
 clean:
 		$(RM) remotecontrol *.o *.d *.bak *~
 
diff --git a/StarNetServer/Makefile b/StarNetServer/Makefile
index 566b79a..71f2307 100644
--- a/StarNetServer/Makefile
+++ b/StarNetServer/Makefile
@@ -10,6 +10,9 @@ starnetserver:	$(OBJECTS)
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../GUICommon -I../ircDDB -c -o $@ $<
 
+install:
+		install -g bin -o root -m 0775 starnetserver $(BINDIR)
+
 clean:
 		$(RM) starnetserver *.o *.d *.bak *~
 
diff --git a/TextTransmit/Makefile b/TextTransmit/Makefile
index e087564..1b01694 100644
--- a/TextTransmit/Makefile
+++ b/TextTransmit/Makefile
@@ -8,6 +8,9 @@ texttransmit:	$(OBJECTS)
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -c -o $@ $<
 
+install:
+		install -g bin -o root -m 0775 texttransmit $(BINDIR)
+
 clean:
 		$(RM) texttransmit *.o *.d *.bak *~
 
diff --git a/TimeServer/Makefile b/TimeServer/Makefile
index 37ffd2b..f8a8c03 100644
--- a/TimeServer/Makefile
+++ b/TimeServer/Makefile
@@ -9,6 +9,9 @@ timeserver:	$(OBJECTS)
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../GUICommon -c -o $@ $<
 
+install:
+		install -g bin -o root -m 0775 timeserver $(BINDIR)
+
 clean:
 		$(RM) timeserver *.o *.d *.bak *~
 
diff --git a/TimerControl/Makefile b/TimerControl/Makefile
index 98a2032..7c704e0 100644
--- a/TimerControl/Makefile
+++ b/TimerControl/Makefile
@@ -9,6 +9,9 @@ timercontrol:	$(OBJECTS)
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../GUICommon -c -o $@ $<
 
+install:
+		install -g bin -o root -m 0775 timercontrol $(BINDIR)
+
 clean:
 		$(RM) timercontrol *.o *.d *.bak *~
 
diff --git a/VoiceTransmit/Makefile b/VoiceTransmit/Makefile
index eba8e30..4d5709f 100644
--- a/VoiceTransmit/Makefile
+++ b/VoiceTransmit/Makefile
@@ -8,6 +8,9 @@ voicetransmit:	$(OBJECTS)
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -c -o $@ $<
 
+install:
+		install -g bin -o root -m 0775 voicetransmit $(BINDIR)
+
 clean:
 		$(RM) voicetransmit *.o *.d *.bak *~
 
diff --git a/ircDDBGateway/Makefile b/ircDDBGateway/Makefile
index f50a4af..84b63b3 100644
--- a/ircDDBGateway/Makefile
+++ b/ircDDBGateway/Makefile
@@ -9,6 +9,9 @@ ircddbgateway:	$(OBJECTS)
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../ircDDB -c -o $@ $<
 
+install:
+		install -g bin -o root -m 0775 ircddbgateway $(BINDIR)
+
 clean:
 		$(RM) ircddbgateway *.o *.d *.bak *~
 
diff --git a/ircDDBGatewayConfig/Makefile b/ircDDBGatewayConfig/Makefile
index 83d1632..18ed87c 100644
--- a/ircDDBGatewayConfig/Makefile
+++ b/ircDDBGatewayConfig/Makefile
@@ -9,6 +9,9 @@ ircddbgatewayconfig:	$(OBJECTS)
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -I../Common -I../GUICommon -c -o $@ $<
 
+install:
+		install -g bin -o root -m 0775 ircddbgatewayconfig $(BINDIR)
+
 clean:
 		$(RM) ircddbgatewayconfig *.o *.d *.bak *~