diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
index 3c586c9da3c..4441f36ac40 100644
--- a/src/core/qgsproviderregistry.cpp
+++ b/src/core/qgsproviderregistry.cpp
@@ -114,11 +114,15 @@ QgsProviderRegistry::QgsProviderRegistry(QString pluginPath)
         // get the description and the key for the provider plugin
         isprovider_t *isProvider = (isprovider_t *) myLib->resolve("isProvider");
 
-        if (isProvider)
+	//MH: Added a further test to detect non-provider plugins linked to provider plugins.
+	//Only pure provider plugins have 'type' not defined
+	isprovider_t *hasType = (isprovider_t *) myLib->resolve("type");
+
+        if (!hasType && isProvider)
         {
           // check to see if this is a provider plugin
           if (isProvider())
-          {
+	    {
             // looks like a provider. get the key and description
             description_t *pDesc = (description_t *) myLib->resolve("description");
             providerkey_t *pKey = (providerkey_t *) myLib->resolve("providerKey");
diff --git a/src/plugins/wfs/Makefile.am b/src/plugins/wfs/Makefile.am
index 6df3c192a52..ab72f858497 100644
--- a/src/plugins/wfs/Makefile.am
+++ b/src/plugins/wfs/Makefile.am
@@ -59,7 +59,9 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
 wfsplugin_la_LIBADD = $(QT_LDADD) \
 			    $(GDAL_LDADD) \
 			    ../../core/libqgis_core.la \
-			    ../../gui/libqgis_gui.la
+			    ../../gui/libqgis_gui.la \
+				../../providers/wfs/libwfsprovider.la
+
 wfsplugin_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
 wfsplugin_la_CXXFLAGS = $(CXXFLAGS) \
 			      $(EXTRA_CXXFLAGS) \
diff --git a/src/providers/wfs/Makefile.am b/src/providers/wfs/Makefile.am
index 591d3668d71..723e58ca4ad 100644
--- a/src/providers/wfs/Makefile.am
+++ b/src/providers/wfs/Makefile.am
@@ -3,17 +3,17 @@ INCLUDES = -I../../core/ -I../../gui/ -I../../ui
 %.moc.cpp: %.h
 	$(MOC) -o $@ $<
 
-wfsprovider_MOC = qgshttptransaction.moc.cpp
+libwfsprovider_MOC = qgshttptransaction.moc.cpp
 
 plugindir = ${pkglibdir}
-plugin_LTLIBRARIES = wfsprovider.la
+plugin_LTLIBRARIES = libwfsprovider.la
 
-wfsprovider_la_SOURCES = qgswfsprovider.cpp
+libwfsprovider_la_SOURCES = qgswfsprovider.cpp qgshttptransaction.cpp $(libwfsprovider_MOC)
 
 BUILT_SOURCES = $(wfsprovider_MOC)
 
-wfsprovider_la_LIBADD = $(QT_LDADD)  $(GDAL_LIB) $(GEOS_LDADD) ../../gui/libqgis_gui.la ../../core/libqgis_core.la
-wfsprovider_la_LDFLAGS = -avoid-version -module
-wfsprovider_la_CXXFLAGS = $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
+libwfsprovider_la_LIBADD = $(QT_LDADD)  $(GDAL_LIB) $(GEOS_LDADD) ../../gui/libqgis_gui.la ../../core/libqgis_core.la
+libwfsprovider_la_LDFLAGS = -avoid-version -module
+libwfsprovider_la_CXXFLAGS = $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
 
 CLEANFILES = $(BUILT_SOURCES)
\ No newline at end of file