diff --git a/fhem/CHANGED b/fhem/CHANGED
index 24cfc9fc2..0738cf075 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -322,4 +322,5 @@
   - bugfix: more thorough serial line initialization
 
 - ==DATE== (4.1)
-  - doc: linux.html (private udev-rules, not 50-..., ATTRS)
+  - doc:     linux.html (private udev-rules, not 50-..., ATTRS)
+  - bugfix:  setting devices with "-" in their name did not work
diff --git a/fhem/Makefile b/fhem/Makefile
index bbc74828a..da12744c9 100644
--- a/fhem/Makefile
+++ b/fhem/Makefile
@@ -2,7 +2,7 @@ BINDIR=/usr/local/bin
 MODDIR=/usr/local/lib
 
 VERS=4.0
-DATE=2006-04-14
+DATE=2007-04-14
 DIR=fhem-$(VERS)
 
 all:
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index 742337e48..fcf8a85ea 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -785,6 +785,14 @@ CommandSet($$)
   foreach my $sdev (split(",", $dev)) {
 
     if($sdev =~ m/-/) {		 # Range (separated by -)
+
+      if(defined($defs{$sdev})) {
+        $a[0] = $sdev;
+        my $ret = DoSet(@a);
+        push @rets, $ret if($ret);
+        next;
+      }
+
       my @lim = split("-", $sdev);
       foreach my $sd (sort keys %defs) {
         next if($sd lt $lim[0] || $sd gt $lim[1]);
diff --git a/fhem/test/fhem.save b/fhem/test/fhem.save
index cbbcaf519..a62490934 100644
--- a/fhem/test/fhem.save
+++ b/fhem/test/fhem.save
@@ -1,11 +1,12 @@
-#Sat Apr 14 10:31:43 2007
+#Sun Apr 15 13:56:14 2007
 setstate FHZ fhtbuf: 1c
 setstate FHZ 2006-02-12 14:03:39 fhtbuf 23
 setstate FHZ 2006-03-26 08:47:36 init2 deadbeefdeadbe
 setstate FHZ 2006-03-26 08:47:36 serial deadbeef
 setstate btn4 on
 setstate btn4 2006-04-12 15:19:33 state on
-setstate cellar ???
+setstate cellar on
+setstate cellar 2007-04-15 13:53:21 state on
 setstate fl measured-temp: 21.6 (Celsius)
 setstate fl 2006-03-29 23:02:30 actuator 00%
 setstate fl 2006-03-26 08:50:54 day-temp 21.5 (Celsius)
@@ -34,6 +35,8 @@ setstate fl 2006-03-26 08:50:55 windowopen-temp 12.0 (Celsius)
 setstate floor-lamp on
 setstate floor-lamp 2006-03-29 12:05:34 state on
 setstate global <no definition>
+setstate living-light on
+setstate living-light 2007-04-15 13:54:48 state on
 setstate marqee on
 setstate marqee 2006-04-01 12:46:02 state on
 setstate n_btn4 active