diff --git a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/Activator.java b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/Activator.java
index f223781..a3a8951 100644
--- a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/Activator.java
+++ b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/Activator.java
@@ -27,7 +27,7 @@
 import org.osgi.service.upnp.UPnPDevice;
 
 /* 
-* @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
+* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
 */
 public class Activator implements BundleActivator {
 
diff --git a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/Clock.java b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/Clock.java
index cccd1a4..357eaae 100644
--- a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/Clock.java
+++ b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/Clock.java
@@ -21,7 +21,7 @@
 
 import java.util.Calendar;
 /* 
-* @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
+* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
 */
 
 public class Clock
diff --git a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockDevice.java b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockDevice.java
index be9948b..8d87782 100644
--- a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockDevice.java
+++ b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockDevice.java
@@ -29,7 +29,7 @@
 import org.osgi.service.upnp.UPnPIcon;
 import org.osgi.service.upnp.UPnPService;
 /* 
-* @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
+* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
 */
 
 public class ClockDevice implements UPnPDevice {
diff --git a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockFrame.java b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockFrame.java
index 26fde86..263196e 100644
--- a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockFrame.java
+++ b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockFrame.java
@@ -30,7 +30,7 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 /* 
-* @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
+* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
 */
 
 public class ClockFrame extends JFrame implements Runnable 
diff --git a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockIcon.java b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockIcon.java
index 132cbac..faa7950 100644
--- a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockIcon.java
+++ b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockIcon.java
@@ -23,7 +23,7 @@
 
 import org.osgi.service.upnp.UPnPIcon;
 /* 
-* @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
+* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
 */
 
 public class ClockIcon implements UPnPIcon {
diff --git a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockPane.java b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockPane.java
index 7901254..9cc5c0c 100644
--- a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockPane.java
+++ b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ClockPane.java
@@ -31,7 +31,7 @@
 import javax.swing.JPanel;
 
 /* 
-* @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
+* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
 */
 
 public class ClockPane extends JPanel  // MouseListener
diff --git a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/EventSource.java b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/EventSource.java
index 5f3396b..504610e 100644
--- a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/EventSource.java
+++ b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/EventSource.java
@@ -21,7 +21,7 @@
 
 import java.beans.PropertyChangeListener;
 /* 
-* @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
+* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
 */
 
 public interface EventSource {
diff --git a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/GetTimeAction.java b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/GetTimeAction.java
index 82cbd7b..f2f4abb 100644
--- a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/GetTimeAction.java
+++ b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/GetTimeAction.java
@@ -26,7 +26,7 @@
 import org.osgi.service.upnp.UPnPStateVariable;
 
 /* 
-* @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
+* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
 */
 
 public class GetTimeAction implements UPnPAction {
diff --git a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ResultStateVariable.java b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ResultStateVariable.java
index 8e08f66..f77dd0c 100644
--- a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ResultStateVariable.java
+++ b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/ResultStateVariable.java
@@ -20,7 +20,7 @@
 package org.apache.felix.upnp.sample.clock;
 import org.osgi.service.upnp.UPnPStateVariable;
 /* 
-* @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
+* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
 */
 
 public class ResultStateVariable implements UPnPStateVariable{
diff --git a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/SetTimeAction.java b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/SetTimeAction.java
index 94424a0..9719aa2 100644
--- a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/SetTimeAction.java
+++ b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/SetTimeAction.java
@@ -25,7 +25,7 @@
 import org.osgi.service.upnp.UPnPStateVariable;
 
 /* 
-* @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
+* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
 */
 
 public class SetTimeAction implements UPnPAction {
diff --git a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/TimeStateVariable.java b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/TimeStateVariable.java
index 5a5df75..cb938c3 100644
--- a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/TimeStateVariable.java
+++ b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/TimeStateVariable.java
@@ -20,7 +20,7 @@
 package org.apache.felix.upnp.sample.clock;
 import org.osgi.service.upnp.UPnPStateVariable;
 /* 
-* @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
+* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
 */
 
 public class TimeStateVariable implements UPnPStateVariable{
diff --git a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/TimerService.java b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/TimerService.java
index 9306e70..76edcaa 100644
--- a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/TimerService.java
+++ b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/TimerService.java
@@ -26,7 +26,7 @@
 import org.osgi.service.upnp.UPnPStateVariable;
 
 /* 
-* @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
+* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
 */
 
 public class TimerService implements UPnPService {
diff --git a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/UPnPEventNotifier.java b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/UPnPEventNotifier.java
index 38abef5..56504a4 100644
--- a/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/UPnPEventNotifier.java
+++ b/upnp.sample.clock/src/main/java/org/apache/felix/upnp/sample/clock/UPnPEventNotifier.java
@@ -38,7 +38,7 @@
 import org.osgi.service.upnp.UPnPStateVariable;
 
 /* 
-* @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
+* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
 */
 
 public class UPnPEventNotifier implements PropertyChangeListener,ServiceListener {