diff --git a/configure.in b/configure.in
index c89a81b..5a27dcd 100644
--- a/configure.in
+++ b/configure.in
@@ -38,7 +38,7 @@ else
     fi
 fi
 
-AM_INIT_AUTOMAKE($PACKAGENAME, $MAJOR.$MINOR.$LEAST, [marc.waeckerlin@tech.swisssign.com])
+AM_INIT_AUTOMAKE($PACKAGENAME, $MAJOR.$MINOR.$LEAST, [marc@waeckerlin.org])
 
 # files to create
 AC_CONFIG_FILES([makefile ${PACKAGENAME}.spec src/version.cxx
diff --git a/debian/changelog.in b/debian/changelog.in
index 2bb697a..17b13cd 100644
--- a/debian/changelog.in
+++ b/debian/changelog.in
@@ -1,5 +1,5 @@
 @PACKAGE@ (@VERSION@-1) unstable; urgency=low
 
-  * see https://dev.swisssign.com/projects/mrw-c++ for changes
+  * see https://dev.marc.waeckerlin.org/projects/mrw-c++++ for changes
 
- -- Marc Wäckerlin (SwissSign AG) <marc.waeckerlin@tech.swisssign.com>  Wed, 07 Apr 2010 10:23:02 +0200
+ -- Marc Wäckerlin (http://marc.waeckerlin.org) <marc@waeckerlin.org>  Wed, 07 Apr 2010 10:23:02 +0200
diff --git a/debian/control.in b/debian/control.in
index f332e6b..0c226e6 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,10 +1,10 @@
 Source: mrw-c++
 Priority: extra
-Maintainer: Marc Wäckerlin (SwissSign AG) <marc.waeckerlin@tech.swisssign.com>
+Maintainer: Marc Wäckerlin (http://marc.waeckerlin.org) <marc@waeckerlin.org>
 Build-Depends: debhelper (>= 7), autotools-dev
 Standards-Version: 3.8.1
 Section: libs
-Homepage: https://dev.swisssign.com/projects/mrw-c++
+Homepage: https://dev.marc.waeckerlin.org/projects/mrw-c++++
 
 Package: mrw-c++-dev
 Section: libdevel
diff --git a/debian/copyright b/debian/copyright
index 9dcb31f..061e409 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,15 @@
-This package was debianized by Marc Wäckerlin (SwissSign AG) <marc.waeckerlin@tech.swisssign.com> on
+This package was debianized by Marc Wäckerlin (http://marc.waeckerlin.org) <marc@waeckerlin.org> on
 Wed, 07 Apr 2010 10:23:02 +0200.
 
-It was downloaded from https://dev.swisssign.com/projects/mrw-c++
+It was downloaded from https://dev.marc.waeckerlin.org/projects/mrw-c++++
 
 Upstream Author(s):
 
-    Marc Wäckerlin (SwissSign AG) <marc.waeckerlin@tech.swisssign.com>
+    Marc Wäckerlin (http://marc.waeckerlin.org) <marc@waeckerlin.org>
 
 Copyright:
 
-    Marc Wäckerlin (SwissSign AG) <marc.waeckerlin@tech.swisssign.com>
+    Marc Wäckerlin (http://marc.waeckerlin.org) <marc@waeckerlin.org>
 
 License:
 
@@ -17,7 +17,7 @@ License:
 
 The Debian packaging is:
 
-    Copyright (C) 2010 Marc Wäckerlin (SwissSign AG) <marc.waeckerlin@tech.swisssign.com>
+    Copyright (C) 2010 Marc Wäckerlin (http://marc.waeckerlin.org) <marc@waeckerlin.org>
 
 and is licensed under the GPL version 3, 
 see `/usr/share/common-licenses/GPL-3'.
diff --git a/doc/doxyfile.in b/doc/doxyfile.in
index 63f0615..dda9f00 100644
--- a/doc/doxyfile.in
+++ b/doc/doxyfile.in
@@ -940,17 +940,17 @@ DOCSET_FEEDNAME        = "Doxygen generated docs"
 # reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
 # will append .docset to the name.
 
-DOCSET_BUNDLE_ID       = com.swisssign.dev
+DOCSET_BUNDLE_ID       = org.waeckerlin.marc.dev
 
 # When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
 # the documentation publisher. This should be a reverse domain-name style
 # string, e.g. com.mycompany.MyDocSet.documentation.
 
-DOCSET_PUBLISHER_ID    = com.swisssign.dev
+DOCSET_PUBLISHER_ID    = org.waeckerlin.marc.dev
 
 # The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
 
-DOCSET_PUBLISHER_NAME  = "Marc Wäckerlin (SwissSign AG)"
+DOCSET_PUBLISHER_NAME  = "Marc Wäckerlin (http://marc.waeckerlin.org) <marc@waeckerlin.org>"
 
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files
 # will be generated that can be used as input for tools like the
@@ -1064,7 +1064,7 @@ GENERATE_ECLIPSEHELP   = NO
 # the directory name containing the HTML and XML files should also have
 # this name.
 
-ECLIPSE_DOC_ID         = com.swisssign.dev
+ECLIPSE_DOC_ID         = org.waeckerlin.marc.dev
 
 # The DISABLE_INDEX tag can be used to turn on/off the condensed index at
 # top of each HTML page. The value NO (the default) enables the index and