diff --git a/.gitignore b/.gitignore
index 6a78789..9fdea72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ compile
 .libs
 .dirstamp
 m4
+src/libhagelbarger/libhagelbarger.a
 src/libdtmf/libdtmf.a
 src/libgermanton/libgermanton.a
 src/libtimer/libtimer.a
diff --git a/configure.ac b/configure.ac
index d59d068..092bd4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,6 +75,7 @@ AS_IF([test "x$with_soapy" == "xyes"],[AC_MSG_NOTICE( Compiling with SoapySDR su
 AS_IF([test "x$somethingmagick" == "xyes"],[AC_MSG_NOTICE( Compiling with ImageMagick )],[AC_MSG_NOTICE( ImageMagick not supported )])
 
 AC_OUTPUT(
+    src/libhagelbarger/Makefile
     src/libdtmf/Makefile
     src/libgermanton/Makefile
     src/libtimer/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index c4670e3..70755da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,3 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = libdtmf libgermanton libtimer libsamplerate libscrambler libfilter libwave common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
+SUBDIRS = libhagelbarger libdtmf libgermanton libtimer libsamplerate libscrambler libfilter libwave common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
 
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index ba74b61..f47ce13 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -25,7 +25,6 @@ libmobile_a_SOURCES = \
 	mncc_console.c \
 	mncc_cross.c \
 	mncc_sock.c \
-	hagelbarger.c \
 	display_status.c \
 	main_mobile.c
 
diff --git a/src/libhagelbarger/Makefile.am b/src/libhagelbarger/Makefile.am
new file mode 100644
index 0000000..ffd50e7
--- /dev/null
+++ b/src/libhagelbarger/Makefile.am
@@ -0,0 +1,6 @@
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+
+noinst_LIBRARIES = libhagelbarger.a
+
+libhagelbarger_a_SOURCES = \
+	hagelbarger.c
diff --git a/src/common/hagelbarger.c b/src/libhagelbarger/hagelbarger.c
similarity index 100%
rename from src/common/hagelbarger.c
rename to src/libhagelbarger/hagelbarger.c
diff --git a/src/common/hagelbarger.h b/src/libhagelbarger/hagelbarger.h
similarity index 100%
rename from src/common/hagelbarger.h
rename to src/libhagelbarger/hagelbarger.h
diff --git a/src/nmt/Makefile.am b/src/nmt/Makefile.am
index 041d9b3..7598971 100644
--- a/src/nmt/Makefile.am
+++ b/src/nmt/Makefile.am
@@ -22,6 +22,7 @@ nmt_SOURCES = \
 nmt_LDADD = \
 	$(COMMON_LA) \
 	libdmssms.a \
+	$(top_builddir)/src/libhagelbarger/libhagelbarger.a \
 	$(top_builddir)/src/libdtmf/libdtmf.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
diff --git a/src/nmt/frame.c b/src/nmt/frame.c
index dd0df8f..05b322a 100644
--- a/src/nmt/frame.c
+++ b/src/nmt/frame.c
@@ -24,7 +24,7 @@
 #include <inttypes.h>
 #include "../common/sample.h"
 #include "../common/debug.h"
-#include "../common/hagelbarger.h"
+#include "../libhagelbarger/hagelbarger.h"
 #include "nmt.h"
 #include "frame.h"
 
diff --git a/src/r2000/Makefile.am b/src/r2000/Makefile.am
index 8352e9f..d6dabca 100644
--- a/src/r2000/Makefile.am
+++ b/src/r2000/Makefile.am
@@ -12,6 +12,7 @@ radiocom2000_SOURCES = \
 	main.c
 radiocom2000_LDADD = \
 	$(COMMON_LA) \
+	$(top_builddir)/src/libhagelbarger/libhagelbarger.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
diff --git a/src/r2000/frame.c b/src/r2000/frame.c
index 41c194a..ab0b9dd 100644
--- a/src/r2000/frame.c
+++ b/src/r2000/frame.c
@@ -23,8 +23,8 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <inttypes.h>
-#include "../common/hagelbarger.h"
 #include "../common/debug.h"
+#include "../libhagelbarger/hagelbarger.h"
 #include "frame.h"
 
 static const char *param_hex(uint64_t value)
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 38bb717..412fd5c 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -98,6 +98,7 @@ test_hagelbarger_SOURCES = dummy.c test_hagelbarger.c
 
 test_hagelbarger_LDADD = \
 	$(COMMON_LA) \
+	$(top_builddir)/src/libhagelbarger/libhagelbarger.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
 	$(ALSA_LIBS) \
diff --git a/src/test/test_hagelbarger.c b/src/test/test_hagelbarger.c
index 1e0838a..c2a9937 100644
--- a/src/test/test_hagelbarger.c
+++ b/src/test/test_hagelbarger.c
@@ -1,7 +1,7 @@
 #include "stdio.h"
 #include "stdint.h"
 #include "string.h"
-#include "../common/hagelbarger.h"
+#include "../libhagelbarger/hagelbarger.h"
 
 int main(void)
 {