diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbe5db9..23aa0b7 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,18 +1,26 @@
 cmake_minimum_required(VERSION 2.8.3)
-project(nmea_tcp_driver)
+project(nmea_navsat_driver)
 
-find_package(catkin REQUIRED COMPONENTS roslint)
+find_package(catkin REQUIRED)
 
 catkin_python_setup()
 catkin_package()
 
 install(PROGRAMS
-   scripts/nmea_tcp_driver
+   scripts/nmea_serial_driver
+   scripts/nmea_socket_driver
    scripts/nmea_topic_driver
-   scripts/nmea_topic_tcp_reader
+   scripts/nmea_topic_serial_reader
    DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
 
-# Check package for pep8 style, add a test to fail on violations.
-roslint_python()
-roslint_add_test()
+install(DIRECTORY launch/
+   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
+   FILES_MATCHING PATTERN "*.launch"
+)
+
+if (CATKIN_ENABLE_TESTING)
+  find_package(roslint)
+  roslint_python()
+  roslint_add_test()
+endif()
diff --git a/launch/nmea_tcp_driver.launch b/launch/nmea_tcp_driver.launch
new file mode 100644
index 0000000..602a35b
--- /dev/null
+++ b/launch/nmea_tcp_driver.launch
@@ -0,0 +1,15 @@
+<launch>
+
+  <!-- A simple launch file for the nmea_serial_driver node. -->
+
+  <arg name="host" default="reach.local" />
+  <arg name="port" default="12346" />
+  <arg name="frame_id" default="gps" />
+
+  <node name="nmea_tcp_driver_node" pkg="nmea_tcp_driver" type="nmea_tcp_driver" output="screen">
+    <param name="host" value="$(arg host)" />
+    <param name="port" value="$(arg port)"/>
+    <param name="frame_id" value="$(arg frame_id)" />
+  </node>
+
+</launch>