diff --git a/CHANGED b/CHANGED
index 12e314ab3..e565f3290 100644
--- a/CHANGED
+++ b/CHANGED
@@ -1,5 +1,7 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
+ - change:  20_OWFS: Move to deprecated
+ - change:  21_OWTEMP: Move to deprecated
  - change:  49_SSCam: set compability to SVS 8.2.10
  - bugfix:  58_RPI_1Wire: Improved behaviour when changing pollingInterval
  - change:  93_RFHEM: Moved to deprecated (use FHEM2FHEM)
diff --git a/MAINTAINER.txt b/MAINTAINER.txt
index b5b44d22f..cab346285 100644
--- a/MAINTAINER.txt
+++ b/MAINTAINER.txt
@@ -132,7 +132,6 @@ FHEM/20_FRM_SERVO.pm         jensb                Sonstige Systeme
 FHEM/20_FRM_STEPPER.pm       jensb                Sonstige Systeme
 FHEM/20_GUEST.pm             loredo               Automatisierung
 FHEM/20_N4HBUS.pm            okoerber             Sonstige Systeme
-FHEM/20_OWFS.pm              mfr69bs              1Wire (deprecated)
 FHEM/20_PET.pm               loredo               Automatisierung
 FHEM/20_ROOMMATE.pm          loredo               Automatisierung
 FHEM/20_X10.pm               neubert              SlowRF
@@ -146,7 +145,6 @@ FHEM/21_OWID.pm              pahenning            1Wire
 FHEM/21_OWLCD.pm             pahenning            1Wire
 FHEM/21_OWMULTI.pm           pahenning            1Wire
 FHEM/21_OWSWITCH.pm          pahenning            1Wire
-FHEM/21_OWTEMP.pm            mfr69bs              1Wire (deprecated)
 FHEM/21_OWTHERM.pm           pahenning            1Wire
 FHEM/21_OWVAR.pm             pahenning            1Wire
 FHEM/21_SONOSPLAYER          Reinerlein           Multimedia
diff --git a/UPGRADE b/UPGRADE
index a0f9826b3..444dd7046 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -43,10 +43,12 @@ enable the old feature.
     NOTE: In 6.0 version this can be forced by new attribute offState
   - 96_allowed: the default for allowedIfAuthenticatedByMe is now 1 (relevant
     if there are multiple allowed devices valid for the same target).
-  - Deprecated modules (consider replacing them by prior to upgrading):
+  - Deprecated modules (consider replacing them by named alternative(s) 
+    prior to upgrading):
     10_MQTT_BRIDGE (=> MQTT_GENERIC_BRIDGE)
     98_Heating_Control (=> WeekdayTimer)
     10_EIB (=> 10_KNX)
     93_RFHEM (=> FHEM2FHEM)
     58_GPIO4 (=> RPI_1Wire)
-
+    20_OWFS (=> OWServer, or OWX)
+    21_OWTEMP (=> OWDevice)
diff --git a/FHEM/20_OWFS.pm b/contrib/deprecated/20_OWFS.pm
similarity index 99%
rename from FHEM/20_OWFS.pm
rename to contrib/deprecated/20_OWFS.pm
index 265cadfe1..d7076ceda 100644
--- a/FHEM/20_OWFS.pm
+++ b/contrib/deprecated/20_OWFS.pm
@@ -21,7 +21,7 @@
 #  GNU General Public License for more details.
 #
 ################################################################
-# $Id$
+# $Id: 20_OWFS.pm 2516 2013-01-14 10:41:48Z mfr69bs $
 package main;
 
 use strict;
diff --git a/FHEM/21_OWTEMP.pm b/contrib/deprecated/21_OWTEMP.pm
similarity index 99%
rename from FHEM/21_OWTEMP.pm
rename to contrib/deprecated/21_OWTEMP.pm
index 9258963a6..43432968b 100644
--- a/FHEM/21_OWTEMP.pm
+++ b/contrib/deprecated/21_OWTEMP.pm
@@ -21,7 +21,7 @@
 #  GNU General Public License for more details.
 #
 ################################################################
-# $Id$
+# $Id: 21_OWTEMP.pm 6164 2014-06-25 13:40:30Z ntruchsess $
 package main;
 
 use strict;