diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..14a9247
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+cmake-build-debug/
+/.idea/
+/build/
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..7e0af24
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "airspy"]
+	path = airspy
+	url = https://github.com/airspy/airspyone_host
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..d505144
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,25 @@
+project(adsbdec)
+
+cmake_minimum_required(VERSION 3.10)
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+include(FindPackageHandleStandardArgs)
+
+add_library(
+        adsbdec-lib
+        demod.c
+        crc.c
+        output.c
+        air.c
+        valid.c
+)
+
+add_subdirectory(airspy)
+
+find_package(LIBUSB REQUIRED)
+
+include_directories(${LIBUSB_INCLUDE_DIR})
+include_directories(airspy/libairspy/src)
+
+add_executable(adsbdec main.c)
+target_link_libraries(adsbdec-lib m airspy-static ${LIBUSB_LIBRARIES})
+target_link_libraries(adsbdec adsbdec-lib)
\ No newline at end of file
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 6ee2386..0000000
--- a/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-CFLAGS= -Wall -Ofast -march=native -pthread -I.  `pkg-config --cflags libairspy`
-
-LIBS= -lm -pthread  `pkg-config --libs libairspy libusb` 
-
-adsbdec: demod.o main.o crc.o output.o air.o valid.o
-	$(CC) $(LDFLAGS) demod.o main.o crc.o output.o air.o valid.o $(LIBS) -o adsbdec
-
-install: adsbdec
-	sudo cp adsbdec /usr/local/bin
-
-uninstall: 
-	sudo rm /usr/local/bin
-
-clean:
-	rm *.o adsbdec
diff --git a/README.md b/README.md
index d5fc6e2..30e3f8b 100644
--- a/README.md
+++ b/README.md
@@ -31,4 +31,9 @@ If you need that adsbdec act as server (like dump1090) :
    Need libusb and libairspy
 
   Just do
-> make
+```shell
+mkdir build
+cd build
+cmake ..
+make
+```
diff --git a/air.c b/air.c
index 30e9bd6..f200291 100644
--- a/air.c
+++ b/air.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <time.h>
-#include <libairspy/airspy.h>
+#include <airspy.h>
 #include "adsbdec.h"
 
 #define AIR_SAMPLE_RATE 20000000
diff --git a/airspy b/airspy
new file mode 160000
index 0000000..0bccf3b
--- /dev/null
+++ b/airspy
@@ -0,0 +1 @@
+Subproject commit 0bccf3b88830d3e5ec029cfb42b9d4c2f2ec8554
diff --git a/cmake/FindLIBUSB.cmake b/cmake/FindLIBUSB.cmake
new file mode 100644
index 0000000..cc3fb92
--- /dev/null
+++ b/cmake/FindLIBUSB.cmake
@@ -0,0 +1,37 @@
+# - Try to find the freetype library
+# Once done this defines
+#
+#  LIBUSB_FOUND - system has libusb
+#  LIBUSB_INCLUDE_DIR - the libusb include directory
+#  LIBUSB_LIBRARIES - Link these to use libusb
+
+# Copyright (c) 2006, 2008  Laurent Montel, <montel@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+if (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+
+  # in cache already
+  set(LIBUSB_FOUND TRUE)
+
+else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+
+  find_package(PkgConfig)
+  if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_LIBUSB libusb-1.0)
+  endif(PKG_CONFIG_FOUND)
+
+  FIND_PATH(LIBUSB_INCLUDE_DIR libusb.h
+    PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS})
+
+  FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0
+    PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS})
+
+  include(FindPackageHandleStandardArgs)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR)
+
+  MARK_AS_ADVANCED(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES)
+
+endif (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
diff --git a/crc.c b/crc.c
index 2978fe3..b42fc48 100644
--- a/crc.c
+++ b/crc.c
@@ -18,7 +18,7 @@
  */
 #include <stddef.h>
 #include <inttypes.h>
-#include <crc.h>
+#include "crc.h"
 
 static const uint32_t error_table[112] = {
 	0x3935ea, 0x1c9af5, 0xf1b77e, 0x78dbbf, 0xc397db, 0x9e31e9, 0xb0e2f0, 0x587178,