diff --git a/rpm/sensorfw-qt5-hybris.spec b/rpm/sensorfw-qt5-hybris.spec
index f38ed49f..8c82889f 100644
--- a/rpm/sensorfw-qt5-hybris.spec
+++ b/rpm/sensorfw-qt5-hybris.spec
@@ -1,6 +1,6 @@
 Name:       hybris-libsensorfw-qt5
 Summary:    Sensor Framework Qt5
-Version:    0.8.7
+Version:    0.8.17
 Release:    0
 Group:      System/Sensor Framework
 License:    LGPLv2+
@@ -8,9 +8,7 @@ URL:        http://gitorious.org/sensorfw
 Source0:    %{name}-%{version}.tar.bz2
 # Eventhough these are really needed we have these here
 # as those are added to packaging dir by tar_git.
-Source1:    sensord-daemon-conf-setup
 Source2:    sensorfwd.service
-Requires:   %{name}-configs
 Requires:   sensord-qt5
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -22,6 +20,7 @@ BuildRequires:  pkgconfig(mlite5)
 BuildRequires:  pkgconfig(sensord-qt5)
 BuildRequires:  pkgconfig(libhardware)
 BuildRequires:  pkgconfig(android-headers)
+Obsoletes: %{name}-configs <= 0.8.17
 
 %description
 Sensor Framework provides an interface to hardware sensor drivers through logical sensors. This package contains sensor framework daemon and required libraries.
@@ -37,18 +36,6 @@ Requires:   qt5-qtnetwork-devel
 %description devel
 Development headers for sensor framework daemon and libraries.
 
-
-%package configs
-Summary:    Sensorfw configuration files
-Group:      System/Libraries
-BuildArch:  noarch
-Requires:   %{name} = %{version}
-Provides:   sensord-configs
-Obsoletes:  sensorfw-qt5-configs <= 0.7.3.31
-
-%description configs
-Sensorfw configuration files.
-
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -68,7 +55,6 @@ export QT_SELECT=5
 
 %post
 /sbin/ldconfig
-%{_bindir}/sensord-daemon-conf-setup
 
 %postun
 /sbin/ldconfig
@@ -82,7 +68,3 @@ export QT_SELECT=5
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/sensord-qt5/*
-
-%files configs
-%defattr(-,root,root,-)
-%config %{_sysconfdir}/sensorfw/sensord-hybris.conf
diff --git a/rpm/sensorfw-qt5.spec b/rpm/sensorfw-qt5.spec
index 6497a98f..1b620a4e 100644
--- a/rpm/sensorfw-qt5.spec
+++ b/rpm/sensorfw-qt5.spec
@@ -1,6 +1,6 @@
 Name:       sensorfw-qt5
 Summary:    Sensor Framework Qt5
-Version:    0.8.7
+Version:    0.8.17
 Release:    0
 Group:      System/Sensor Framework
 License:    LGPLv2+
@@ -137,8 +137,6 @@ systemctl daemon-reload || :
 
 %config %{_sysconfdir}/dbus-1/system.d/sensorfw.conf
 %dir %{_sysconfdir}/sensorfw
-%config %{_sysconfdir}/sensorfw/sensord.conf
-%dir %{_sysconfdir}/sensorfw/sensord.conf.d/
 %{_unitdir}/sensorfwd.service
 %{_unitdir}/graphical.target.wants/sensorfwd.service
 %{_bindir}/sensord-daemon-conf-setup
@@ -182,8 +180,6 @@ systemctl daemon-reload || :
 %files configs
 %defattr(-,root,root,-)
 %config %{_sysconfdir}/sensorfw/sensord.conf.d/*conf
-%config %{_sysconfdir}/sensorfw/*conf
-%exclude %{_sysconfdir}/sensorfw/sensord.conf
 
 %files docs
 %{_prefix}/share/doc/sensord-qt5
diff --git a/rpm/sensorfwd.service b/rpm/sensorfwd.service
index ecbf1d55..e4ccd61f 100644
--- a/rpm/sensorfwd.service
+++ b/rpm/sensorfwd.service
@@ -7,7 +7,6 @@ Conflicts=actdead.target
 [Service]
 Type=forking
 BusName=com.nokia.SensorService
-ExecStartPre=/bin/sh /usr/bin/sensord-daemon-conf-setup
 ExecStart=/usr/sbin/sensorfwd -c=/etc/sensorfw/primaryuse.conf -d --log-level=warning --no-magnetometer-bg-calibration
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=always
diff --git a/sensorfw.pro b/sensorfw.pro
index 572b13b1..aa7079de 100644
--- a/sensorfw.pro
+++ b/sensorfw.pro
@@ -59,39 +59,15 @@ contains(CONFIG,hybris) {
 
 
 equals(QT_MAJOR_VERSION, 5):  {
-    contains(CONFIG,hybris) {
-        SENSORDHYBRISCONFIGFILE.files = config/sensord-hybris.conf
-        SENSORDHYBRISCONFIGFILE.path = /etc/sensorfw
-        INSTALLS += SENSORDHYBRISCONFIGFILE
-
-    } else {
-    config_hybris {
-        SENSORDHYBRISCONFIGFILE.files = config/sensord-hybris.conf
-        SENSORDHYBRISCONFIGFILE.path = /etc/sensorfw
-        INSTALLS += SENSORDHYBRISCONFIGFILE
-    }
+    !contains(CONFIG,hybris) {
+# config file installation not handled here
         DBUSCONFIGFILES.files = sensorfw.conf
         DBUSCONFIGFILES.path = /etc/dbus-1/system.d
-
-        SENSORDCONFIGFILE.files = config/sensord-rx_51.conf \
-		config/sensord-oaktrail.conf \
-		config/sensord-exopc.conf \
-		config/sensord-aava.conf \
-		config/sensord-rm_696.conf \
-		config/sensord-arm_grouper_0000.conf \
-		config/sensord-mrst_cdk.conf \
-		config/sensord-ncdk.conf \
-		config/sensord.conf \
-		config/sensord-rm_680.conf \
-		config/sensord-icdk.conf \
-		config/sensord-u8500.conf \
-
-        SENSORDCONFIGFILE.path = /etc/sensorfw
+        INSTALLS += DBUSCONFIGFILES
 
         SENSORDCONFIGFILES.files = config/90-sensord-default.conf
         SENSORDCONFIGFILES.path = /etc/sensorfw/sensord.conf.d
-
-        INSTALLS += DBUSCONFIGFILES SENSORDCONFIGFILE SENSORDCONFIGFILES
+        INSTALLS += SENSORDCONFIGFILES
 
         SENSORDCONFIGHELPER.files = rpm/sensord-daemon-conf-setup
         SENSORDCONFIGHELPER.path = /usr/bin