diff --git a/YSFGateway/Makefile b/YSFGateway/Makefile
index fd878b1..0e1262b 100644
--- a/YSFGateway/Makefile
+++ b/YSFGateway/Makefile
@@ -6,8 +6,8 @@ CFLAGS  = -g -O3 -Wall -std=c++0x -pthread
 LIBS    = -lm -lpthread
 
 # Use the following CFLAGS and LIBS if you do want to use gpsd.
-CFLAGS  = -g -O3 -Wall -DUSE_GPSD -std=c++0x -pthread
-LIBS    = -lm -lpthread -lgps
+#CFLAGS  = -g -O3 -Wall -DUSE_GPSD -std=c++0x -pthread
+#LIBS    = -lm -lpthread -lgps
 
 LDFLAGS = -g
 
@@ -22,6 +22,9 @@ YSFGateway:	$(OBJECTS)
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -c -o $@ $<
 
+install:
+		install -m 755 YSFGateway /usr/local/bin/
+
 clean:
 		$(RM) YSFGateway *.o *.d *.bak *~
  
diff --git a/YSFParrot/Makefile b/YSFParrot/Makefile
index 78b806c..b23206c 100644
--- a/YSFParrot/Makefile
+++ b/YSFParrot/Makefile
@@ -14,6 +14,9 @@ YSFParrot:	$(OBJECTS)
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -c -o $@ $<
 
+install:
+		install -m 755 YSFParrot /usr/local/bin/
+
 clean:
 		$(RM) YSFParrot *.o *.d *.bak *~
  
diff --git a/YSFParrot/Makefile.Solaris b/YSFParrot/Makefile.Solaris
deleted file mode 100644
index 5c3f51c..0000000
--- a/YSFParrot/Makefile.Solaris
+++ /dev/null
@@ -1,19 +0,0 @@
-CC      = gcc
-CXX     = g++
-CFLAGS  = -g -O3 -Wall -std=c++0x -pthread
-LIBS    = -lsocket -lpthread
-LDFLAGS = -g
-
-OBJECTS = Network.o Parrot.o StopWatch.o Thread.o Timer.o UDPSocket.o YSFParrot.o
-
-all:		YSFParrot
-
-YSFParrot:	$(OBJECTS)
-		$(CXX) $(OBJECTS) $(CFLAGS) $(LIBS) -o YSFParrot
-
-%.o: %.cpp
-		$(CXX) $(CFLAGS) -c -o $@ $<
-
-clean:
-		$(RM) YSFParrot *.o *.d *.bak *~
- 
diff --git a/YSFReflector/Makefile b/YSFReflector/Makefile
index 7204a15..58bfccf 100644
--- a/YSFReflector/Makefile
+++ b/YSFReflector/Makefile
@@ -14,6 +14,9 @@ YSFReflector:	$(OBJECTS)
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -c -o $@ $<
 
+install:
+		install -m 755 YSFReflector /usr/local/bin/
+
 clean:
 		$(RM) YSFReflector *.o *.d *.bak *~
  
diff --git a/YSFReflector/Makefile.Solaris b/YSFReflector/Makefile.Solaris
deleted file mode 100644
index a44d4df..0000000
--- a/YSFReflector/Makefile.Solaris
+++ /dev/null
@@ -1,19 +0,0 @@
-CC      = gcc
-CXX     = g++
-CFLAGS  = -g -O3 -Wall -std=c++0x -pthread
-LIBS    = -lsocket -lpthread
-LDFLAGS = -g
-
-OBJECTS = Conf.o Log.o Network.o StopWatch.o Thread.o Timer.o UDPSocket.o Utils.o YSFReflector.o
-
-all:		YSFReflector
-
-YSFReflector:	$(OBJECTS)
-		$(CXX) $(OBJECTS) $(CFLAGS) $(LIBS) -o YSFReflector
-
-%.o: %.cpp
-		$(CXX) $(CFLAGS) -c -o $@ $<
-
-clean:
-		$(RM) YSFReflector *.o *.d *.bak *~
-