diff --git a/Makefile.am b/Makefile.am
index 8910d5ea..da26981f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -111,6 +111,9 @@ builtin_sources += plugins/phonesim.c
 builtin_modules += g1
 builtin_sources += plugins/g1.c
 
+builtin_modules += calypso
+builtin_sources += plugins/calypso.c
+
 builtin_modules += mbm
 builtin_sources += plugins/mbm.c
 
@@ -122,9 +125,6 @@ builtin_sources += plugins/huawei.c
 
 builtin_modules += novatel
 builtin_sources += plugins/novatel.c
-
-builtin_modules += calypso
-builtin_sources += plugins/calypso.c
 endif
 
 if MAINTAINER_MODE
diff --git a/plugins/modem.conf b/plugins/modem.conf
index 2a3835a8..534cf520 100644
--- a/plugins/modem.conf
+++ b/plugins/modem.conf
@@ -24,3 +24,8 @@
 #[g1]
 #Driver=g1
 #Device=/dev/smd0
+
+# Sample for OpenMoko Freerunner
+#[freerunner]
+#Driver=calypso
+#Device=/dev/ttySAC0