diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt
index 8c1ddb3b3..391057dc9 100644
--- a/sdrbase/CMakeLists.txt
+++ b/sdrbase/CMakeLists.txt
@@ -224,8 +224,10 @@ set(sdrbase_SOURCES
     util/astronomy.cpp
     util/azel.cpp
     util/baudot.cpp
+    util/callsign.cpp
     util/colormap.cpp
     util/coordinates.cpp
+    util/countrydat.cpp
     util/crc.cpp
     util/CRC64.cpp
     util/csv.cpp
@@ -297,6 +299,7 @@ set(sdrbase_SOURCES
     maincore.cpp
     remotetcpsinkstarter.cpp
 
+    resources/data.qrc
     resources/webapi.qrc
 )
 
@@ -468,8 +471,10 @@ set(sdrbase_HEADERS
     util/astronomy.h
     util/azel.h
     util/baudot.h
+    util/callsign.h
     util/colormap.h
     util/coordinates.h
+    util/countrydat.h
     util/CRC64.h
     util/csv.h
     util/db.h
diff --git a/sdrbench/CMakeLists.txt b/sdrbench/CMakeLists.txt
index af39e8600..f3d414f28 100644
--- a/sdrbench/CMakeLists.txt
+++ b/sdrbench/CMakeLists.txt
@@ -9,6 +9,7 @@ set(sdrbench_SOURCES
     parserbench.cpp
     test_golay2312.cpp
     test_ft8.cpp
+    test_callsign.cpp
 )
 
 set(sdrbench_HEADERS
diff --git a/sdrbench/mainbench.cpp b/sdrbench/mainbench.cpp
index 2b57a8dc7..08969d381 100644
--- a/sdrbench/mainbench.cpp
+++ b/sdrbench/mainbench.cpp
@@ -69,6 +69,8 @@ void MainBench::run()
         testGolay2312();
     } else if (m_parser.getTestType() == ParserBench::TestFT8) {
         testFT8(m_parser.getFileName(), m_parser.getArgsStr());
+    } else if (m_parser.getTestType() == ParserBench::TestCallsign) {
+        testCallsign(m_parser.getArgsStr());
     } else {
         qDebug() << "MainBench::run: unknown test type: " << m_parser.getTestType();
     }
diff --git a/sdrbench/mainbench.h b/sdrbench/mainbench.h
index fdb0c0980..e816af6a3 100644
--- a/sdrbench/mainbench.h
+++ b/sdrbench/mainbench.h
@@ -58,6 +58,7 @@ private:
     void testDecimateFF();
     void testGolay2312();
     void testFT8(const QString& wavFile, const QString& argsStr); //!< use with sdrbench/samples/ft8/230105_091630.wav in -f option
+    void testCallsign(const QString& argsStr);
     void decimateII(const qint16 *buf, int len);
     void decimateInfII(const qint16 *buf, int len);
     void decimateSupII(const qint16 *buf, int len);
diff --git a/sdrbench/parserbench.cpp b/sdrbench/parserbench.cpp
index 13b3e0a95..024a74291 100644
--- a/sdrbench/parserbench.cpp
+++ b/sdrbench/parserbench.cpp
@@ -24,7 +24,7 @@
 
 ParserBench::ParserBench() :
     m_testOption(QStringList() << "t" << "test",
-        "Test type: decimateii, decimatefi, decimateff, decimateif, decimateinfii, decimatesupii, ambe, golay2312, ft8"
+        "Test type: decimateii, decimatefi, decimateff, decimateif, decimateinfii, decimatesupii, ambe, golay2312, ft8, callsign"
         "test",
         "decimateii"),
     m_nbSamplesOption(QStringList() << "n" << "nb-samples",
@@ -147,6 +147,8 @@ ParserBench::TestType ParserBench::getTestType() const
         return TestGolay2312;
     } else if (m_testStr == "ft8") {
         return TestFT8;
+    } else if (m_testStr == "callsign") {
+        return TestCallsign;
     } else {
         return TestDecimatorsII;
     }
diff --git a/sdrbench/parserbench.h b/sdrbench/parserbench.h
index 865c22de4..5723bad92 100644
--- a/sdrbench/parserbench.h
+++ b/sdrbench/parserbench.h
@@ -38,7 +38,8 @@ public:
         TestDecimatorsInfII,
         TestDecimatorsSupII,
         TestGolay2312,
-        TestFT8
+        TestFT8,
+        TestCallsign
     } TestType;
 
     ParserBench();