diff --git a/Makefile.am b/Makefile.am
index d508ac59..e7243174 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -151,6 +151,14 @@ builtin_modules += u8500
 builtin_sources += plugins/u8500.c
 endif
 
+if QMIMODEM
+builtin_modules += qmimodem
+builtin_sources += drivers/qmimodem/qmimodem.h drivers/qmimodem/qmimodem.c
+
+builtin_modules += gobi
+builtin_sources += plugins/gobi.c
+endif
+
 if ATMODEM
 builtin_modules += atmodem
 builtin_sources += $(gatchat_sources) \
@@ -306,9 +314,6 @@ endif
 builtin_modules += g1
 builtin_sources += plugins/g1.c
 
-builtin_modules += gobi
-builtin_sources += plugins/gobi.c
-
 builtin_modules += wavecom
 builtin_sources += plugins/wavecom.c
 
diff --git a/configure.ac b/configure.ac
index c1aa51f8..d0bddcc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,6 +177,11 @@ AC_ARG_ENABLE(isimodem, AC_HELP_STRING([--disable-isimodem],
 					[enable_isimodem=${enableval}])
 AM_CONDITIONAL(ISIMODEM, test "${enable_isimodem}" != "no")
 
+AC_ARG_ENABLE(qmimodem, AC_HELP_STRING([--disable-qmimodem],
+				[disable Qualcomm QMI modem support]),
+					[enable_qmimodem=${enableval}])
+AM_CONDITIONAL(QMIMODEM, test "${enable_qmimodem}" != "no")
+
 AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--disable-bluetooth],
 				[disable Bluetooth modem support]),
 					[enable_bluetooth=${enableval}])
diff --git a/drivers/qmimodem/qmimodem.c b/drivers/qmimodem/qmimodem.c
new file mode 100644
index 00000000..afbe4cde
--- /dev/null
+++ b/drivers/qmimodem/qmimodem.c
@@ -0,0 +1,41 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/plugin.h>
+
+#include "qmimodem.h"
+
+static int qmimodem_init(void)
+{
+	return 0;
+}
+
+static void qmimodem_exit(void)
+{
+}
+
+OFONO_PLUGIN_DEFINE(qmimodem, "Qualcomm QMI modem driver", VERSION,
+		OFONO_PLUGIN_PRIORITY_DEFAULT, qmimodem_init, qmimodem_exit)
diff --git a/drivers/qmimodem/qmimodem.h b/drivers/qmimodem/qmimodem.h
new file mode 100644
index 00000000..018747f7
--- /dev/null
+++ b/drivers/qmimodem/qmimodem.h
@@ -0,0 +1,21 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+