diff --git a/app/main.cpp b/app/main.cpp
index 50b76289b..0b572fc32 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -27,7 +27,7 @@
 #include "mainwindow.h"
 #include "dsp/dsptypes.h"
 #ifdef _MSC_VER
-#define GIT_COMMIT_HASH_STR "v4.6.0"
+#define GIT_COMMIT_HASH_STR "v4.7.0"
 #else
 #include "sdrangel_version.h"
 #endif
diff --git a/plugins/channelrx/freqtracker/freqtracker.pro b/plugins/channelrx/freqtracker/freqtracker.pro
index d3f430490..30d43f8ed 100644
--- a/plugins/channelrx/freqtracker/freqtracker.pro
+++ b/plugins/channelrx/freqtracker/freqtracker.pro
@@ -9,7 +9,7 @@ CONFIG += plugin
 
 QT += core gui widgets multimedia
 
-TARGET = demodam
+TARGET = freqtracker
 
 DEFINES += USE_SSE2=1
 QMAKE_CXXFLAGS += -msse2
@@ -26,20 +26,17 @@ INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
 CONFIG(Release):build_subdir = release
 CONFIG(Debug):build_subdir = debug
 
-SOURCES += amdemod.cpp\
-	amdemodgui.cpp\
-	amdemodplugin.cpp\
-        amdemodsettings.cpp\
-        amdemodssbdialog.cpp
+SOURCES += freqtracker.cpp\
+	freqtrackergui.cpp\
+	freqtrackerplugin.cpp\
+    freqtrackersettings.cpp
 
-HEADERS += amdemod.h\
-	amdemodgui.h\
-	amdemodplugin.h\
-        amdemodsettings.h\
-        amdemodssbdialog.h
+HEADERS += freqtracker.h\
+	freqtrackergui.h\
+	freqtrackerplugin.h\
+    freqtrackersettings.h
 
-FORMS += amdemodgui.ui\
-      amdemodssb.ui
+FORMS += freqtrackergui.ui
 
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
diff --git a/pluginssrv/channelrx/CMakeLists.txt b/pluginssrv/channelrx/CMakeLists.txt
index 0f188464a..31c99458a 100644
--- a/pluginssrv/channelrx/CMakeLists.txt
+++ b/pluginssrv/channelrx/CMakeLists.txt
@@ -22,3 +22,4 @@ add_subdirectory(demodssb)
 add_subdirectory(demodwfm)
 add_subdirectory(udpsink)
 add_subdirectory(localsink)
+add_subdirectory(freqtracker)
diff --git a/pluginssrv/channelrx/freqtracker/CMakeLists.txt b/pluginssrv/channelrx/freqtracker/CMakeLists.txt
new file mode 100644
index 000000000..706c404c7
--- /dev/null
+++ b/pluginssrv/channelrx/freqtracker/CMakeLists.txt
@@ -0,0 +1,40 @@
+project(freqtracker)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(PLUGIN_PREFIX "../../../plugins/channelrx/freqtracker")
+
+set(freqtracker_SOURCES
+    ${PLUGIN_PREFIX}/freqtracker.cpp
+	${PLUGIN_PREFIX}/freqtrackersettings.cpp
+	${PLUGIN_PREFIX}/freqtrackerplugin.cpp
+)
+
+set(freqtracker_HEADERS
+    ${PLUGIN_PREFIX}/freqtracker.h
+	${PLUGIN_PREFIX}/freqtrackersettings.h
+	${PLUGIN_PREFIX}/freqtrackerplugin.h
+)
+
+include_directories(
+	.
+	${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+)
+
+add_definitions(${QT_DEFINITIONS})
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_SHARED)
+
+add_library(freqtrackersrv SHARED
+	${freqtracker_SOURCES}
+	${freqtracker_HEADERS_MOC}
+)
+
+target_link_libraries(freqtrackersrv
+	${QT_LIBRARIES}
+	sdrbase
+)
+
+target_link_libraries(freqtrackersrv Qt5::Core)
+
+install(TARGETS freqtrackersrv DESTINATION lib/plugins/channelrx)
diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro
index 6102ac441..c1d1d6b0e 100644
--- a/sdrangel.windows.pro
+++ b/sdrangel.windows.pro
@@ -62,6 +62,7 @@ SUBDIRS += plugins/channelrx/demodssb
 SUBDIRS += plugins/channelrx/demodwfm
 SUBDIRS += plugins/channelrx/udpsink
 SUBDIRS += plugins/channelrx/localsink
+SUBDIRS += plugins/channelrx/freqtracker
 SUBDIRS += plugins/channeltx/modam
 SUBDIRS += plugins/channeltx/modnfm
 SUBDIRS += plugins/channeltx/modssb