diff --git a/.gitignore b/.gitignore
index 126e382..c46c064 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,16 @@
 *~
 build
-mms-engine/mms-engine.pro.user
-mms-lib/mms-lib.pro.user
+mms.pro.user*
+mms-engine/mms-engine.pro.user*
+mms-lib/mms-lib.pro.user*
 mms-lib/test/coverage/full.gcov
 mms-lib/test/coverage/mms-lib.gcov
 mms-lib/test/coverage/results
 mms-lib/test/mms_lib_test.ncb
 mms-lib/test/mms_lib_test.opt
-mms-ofono/mms-ofono.pro.user
-mms-handler-dbus/mms-handler-dbus.pro.user
-mms-handler-dbus/test/mms_handler_dbus_server/test_mms_handler_dbus_server.pro.user
-mms-settings-dconf/mms-settings-dconf.pro.user
+mms-ofono/mms-ofono.pro.user*
+mms-handler-dbus/mms-handler-dbus.pro.user*
+mms-handler-dbus/test/mms_handler_dbus_server/test_mms_handler_dbus_server.pro.user*
+mms-settings-dconf/mms-settings-dconf.pro.user*
 mms-dump/mms_dump.ncb
 mms-dump/mms_dump.opt
diff --git a/mms-dump/mms-dump.pro b/mms-dump/mms-dump.pro
new file mode 100644
index 0000000..b2182ca
--- /dev/null
+++ b/mms-dump/mms-dump.pro
@@ -0,0 +1,8 @@
+TEMPLATE = app
+TARGET = mms-dump
+CONFIG -= qt
+
+CONFIG += link_pkgconfig
+PKGCONFIG += libwspcodec glib-2.0
+
+SOURCES += mms-dump.c
diff --git a/mms-engine/mms-engine.pro b/mms-engine/mms-engine.pro
index f36e22c..d65658a 100644
--- a/mms-engine/mms-engine.pro
+++ b/mms-engine/mms-engine.pro
@@ -10,7 +10,7 @@ INCLUDEPATH += $$MMS_OFONO_DIR/include
 INCLUDEPATH += $$MMS_LIB_DIR/include
 INCLUDEPATH += $$MMS_HANDLER_DIR/include
 INCLUDEPATH += $$MMS_SETTINGS_DIR/include
-QMAKE_CFLAGS += -Wno-unused
+QMAKE_CFLAGS += -Wno-unused-parameter
 
 include(../mms-lib/mms-lib-config.pri)
 
diff --git a/mms-handler-dbus/mms-handler-dbus.pro b/mms-handler-dbus/mms-handler-dbus.pro
index 7796b77..b25931b 100644
--- a/mms-handler-dbus/mms-handler-dbus.pro
+++ b/mms-handler-dbus/mms-handler-dbus.pro
@@ -6,7 +6,7 @@ PKGCONFIG += glib-2.0 gio-2.0 gio-unix-2.0
 DBUS_SPEC_DIR = $$_PRO_FILE_PWD_/spec
 INCLUDEPATH += include
 INCLUDEPATH += ../mms-lib/include
-QMAKE_CFLAGS += -Wno-unused
+QMAKE_CFLAGS += -Wno-unused-parameter
 
 CONFIG(debug, debug|release) {
   DEFINES += DEBUG
diff --git a/mms-lib/mms-lib.pro b/mms-lib/mms-lib.pro
index 4de9c55..fd4537f 100644
--- a/mms-lib/mms-lib.pro
+++ b/mms-lib/mms-lib.pro
@@ -3,7 +3,7 @@ CONFIG += staticlib
 CONFIG += link_pkgconfig
 PKGCONFIG += gmime-2.6 glib-2.0 libsoup-2.4 libwspcodec
 INCLUDEPATH += include
-QMAKE_CFLAGS += -Wno-unused
+QMAKE_CFLAGS += -Wno-unused-parameter
 
 include(mms-lib-config.pri)
 
diff --git a/mms-ofono/mms-ofono.pro b/mms-ofono/mms-ofono.pro
index d1e4002..dfb15ad 100644
--- a/mms-ofono/mms-ofono.pro
+++ b/mms-ofono/mms-ofono.pro
@@ -6,7 +6,7 @@ PKGCONFIG += glib-2.0 gio-2.0 gio-unix-2.0
 DBUS_SPEC_DIR = $$_PRO_FILE_PWD_/spec
 INCLUDEPATH += include
 INCLUDEPATH += ../mms-lib/include
-QMAKE_CFLAGS += -Wno-unused
+QMAKE_CFLAGS += -Wno-unused-parameter
 
 CONFIG(debug, debug|release) {
   DEFINES += DEBUG
diff --git a/mms-send/mms-send.pro b/mms-send/mms-send.pro
new file mode 100644
index 0000000..7232325
--- /dev/null
+++ b/mms-send/mms-send.pro
@@ -0,0 +1,30 @@
+TEMPLATE = app
+TARGET = mms-send
+CONFIG -= qt
+
+CONFIG += link_pkgconfig
+PKGCONFIG +=  gio-unix-2.0 gio-2.0 glib-2.0
+QMAKE_CFLAGS += -Wno-unused-parameter
+
+SOURCES += mms-send.c
+
+DBUS_SPEC_DIR = $$_PRO_FILE_PWD_/../mms-engine
+
+# org.nemomobile.MmsEngine
+MMS_ENGINE_XML = $$DBUS_SPEC_DIR/org.nemomobile.MmsEngine.xml
+MMS_ENGINE_COMMAND = gdbus-codegen --generate-c-code \
+  org.nemomobile.MmsEngine $$MMS_ENGINE_XML
+MMS_ENGINE_DBUS_H = org.nemomobile.MmsEngine.h
+org_nemomobile_mmsengine_h.input = MMS_ENGINE_XML
+org_nemomobile_mmsengine_h.output = $$MMS_ENGINE_DBUS_H
+org_nemomobile_mmsengine_h.commands = $$MMS_ENGINE_COMMAND
+org_nemomobile_mmsengine_h.CONFIG = no_link
+QMAKE_EXTRA_COMPILERS += org_nemomobile_mmsengine_h
+
+MMS_ENGINE_DBUS_C = org.nemomobile.MmsEngine.c
+org_nemomobile_mmsengine_c.input = MMS_ENGINE_XML
+org_nemomobile_mmsengine_c.output = $$MMS_ENGINE_DBUS_C
+org_nemomobile_mmsengine_c.commands = $$MMS_ENGINE_COMMAND
+org_nemomobile_mmsengine_c.CONFIG = no_link
+QMAKE_EXTRA_COMPILERS += org_nemomobile_mmsengine_c
+GENERATED_SOURCES += $$MMS_ENGINE_DBUS_C
diff --git a/mms-settings-dconf/mms-settings-dconf.pro b/mms-settings-dconf/mms-settings-dconf.pro
index a609f6b..251294e 100644
--- a/mms-settings-dconf/mms-settings-dconf.pro
+++ b/mms-settings-dconf/mms-settings-dconf.pro
@@ -5,7 +5,7 @@ CONFIG += link_pkgconfig
 PKGCONFIG += glib-2.0 dconf
 INCLUDEPATH += include
 INCLUDEPATH += ../mms-lib/include
-QMAKE_CFLAGS += -Wno-unused
+QMAKE_CFLAGS += -Wno-unused-parameter
 
 CONFIG(debug, debug|release) {
   DEFINES += DEBUG
diff --git a/mms.pro b/mms.pro
new file mode 100644
index 0000000..8ddbf2f
--- /dev/null
+++ b/mms.pro
@@ -0,0 +1,13 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+SUBDIRS += \
+  mms-lib \
+  mms-handler-dbus \
+  mms-ofono \
+  mms-settings-dconf \
+  mms-engine \
+  mms-dump \
+  mms-send
+OTHER_FILES += \
+  rpm/mms-engine.spec \
+  README