diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..5e51e0d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,14 @@
+language: c
+
+os:
+  - linux
+  - osx
+
+compiler:
+  - clang
+  - gcc
+
+script:
+  #- make
+  - cmake .
+  - cmake --build .
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..28a99f8
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,79 @@
+cmake_minimum_required(VERSION 2.8.4)
+
+project(hdhomerun)
+
+include(CheckLibraryExists)
+
+set(SOURCES 
+  hdhomerun_channels.c
+  hdhomerun_channelscan.c
+  hdhomerun_control.c
+  hdhomerun_debug.c
+  hdhomerun_device.c
+  hdhomerun_discover.c
+  hdhomerun_pkt.c
+  hdhomerun_video.c)
+
+set(HEADERS 
+  hdhomerun.h
+  hdhomerun_channels.h
+  hdhomerun_channelscan.h
+  hdhomerun_control.h
+  hdhomerun_debug.h
+  hdhomerun_device.h
+  hdhomerun_device_selector.h
+  hdhomerun_discover.h
+  hdhomerun_pkt.h
+  hdhomerun_sock.h
+  hdhomerun_types.h
+  hdhomerun_os.h
+  hdhomerun_os_posix.h
+  hdhomerun_os_windows.h
+  hdhomerun_video.h)
+
+if(WIN32)
+  LIST(APPEND SOURCES hdhomerun_os_windows.c)
+  LIST(APPEND SOURCES hdhomerun_sock_windows.c)
+else()
+  LIST(APPEND SOURCES hdhomerun_os_posix.c)
+  LIST(APPEND SOURCES hdhomerun_sock_posix.c)
+endif()
+
+if(WIN32)
+  list(APPEND DEPLIBS ws2_32 iphlpapi)
+else()
+  check_library_exists(pthread pthread_create "" HAVE_LIBPTHREAD)
+  check_library_exists(rt clock_gettime "" HAVE_LIBRT)
+  check_library_exists(socket getaddrinfo "" HAVE_LIBSOCKET)
+  if (HAVE_LIBPTHREAD)
+    list(APPEND DEPLIBS pthread)
+  endif()
+  if (HAVE_LIBRT)
+    list(APPEND DEPLIBS rt)
+  endif()
+  if (HAVE_LIBSOCKET)
+    list(APPEND DEPLIBS socket)
+  endif()
+endif()
+
+add_library(hdhomerun SHARED ${SOURCES})
+target_link_libraries(hdhomerun ${DEPLIBS})
+
+add_library(hdhomerun_static STATIC ${SOURCES})
+target_link_libraries(hdhomerun_static ${DEPLIBS})
+
+if(WIN32)
+  set_target_properties(hdhomerun PROPERTIES DEFINE_SYMBOL "LIBHDHOMERUN_DLLEXPORT") 
+endif()
+
+add_executable(hdhomerun_config hdhomerun_config.c)
+target_link_libraries(hdhomerun_config hdhomerun)
+
+include_directories(${PROJECT_SOURCE_DIR})
+
+install(FILES ${HEADERS} DESTINATION include/hdhomerun)
+install(TARGETS hdhomerun hdhomerun_static hdhomerun_config
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
diff --git a/README.md b/README.md
index 1c24502..36c35f9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-Copyright © 2005-2016 Silicondust USA Inc. <www.silicondust.com>.
+[![Build Status](https://travis-ci.org/zcsizmadia/libhdhomerun.svg?branch=master)](https://travis-ci.org/zcsizmadia/libhdhomerun)
+
+Copyright © 2005-2016 Silicondust USA Inc. <www.silicondust.com>.
 
 This library implements the libhdhomerun protocol for use with Silicondust HDHomeRun TV tuners.