diff --git a/tests/testfreq.c b/tests/testfreq.c
new file mode 100644
index 000000000..8a7559e09
--- /dev/null
+++ b/tests/testfreq.c
@@ -0,0 +1,54 @@
+
+/* 
+ * Very simple test program to check freq convertion --SF
+ * This is mainly to test KHz, MHz, GHz macros and long long support.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <hamlib/rig.h>
+#include "../src/misc.h"
+
+
+int main (int argc, char *argv[])
+{
+	freq_t f=0;
+
+#if 0
+	if (argc != 2) {
+			fprintf(stderr,"Usage: %s <freq>\n",argv[0]);
+			exit(1);
+	}
+
+	f = atoi(argv[1]);
+#endif
+
+	printf("freq_t size: %d\n", sizeof(freq_t));
+	printf("shortfreq_t size: %d\n", sizeof(shortfreq_t));
+
+	/* freq on 31bits test */
+	f = GHz(2);
+	printf("GHz(2) = %lld\n", f);
+
+	/* freq on 32bits test */
+	f = GHz(4);
+	printf("GHz(4) = %lld\n", f);
+
+	/* freq on >32bits test */
+	f = GHz(5);
+	printf("GHz(5) = %lld\n", f);
+
+	/* floating point to freq conversion test */
+	f = GHz(1.3);
+	printf("GHz(1.3) = %lld\n", f);
+
+	/* floating point to freq conversion precision test */
+	f = GHz(1.234567890);
+	printf("GHz(1.234567890) = %lld\n", f);
+
+	/* floating point to freq conversion precision test, with freq >32bits */
+	f = GHz(123.456789012);
+	printf("GHz(123.456789012) = %lld\n", f);
+
+	return 0;
+}