diff --git a/NEWS b/NEWS
index e88f21a8..4c3d3c4e 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
 # Feature which requires OBS 2.1
 #
   - add "osc aggregate --nosources" option
+  - fixed references into en.opensuse.org to honor the new Wiki structure
 
 0.128
   - better default commands selection for editor/pager
diff --git a/osc/commandline.py b/osc/commandline.py
index bffe39df..6b911cbe 100644
--- a/osc/commandline.py
+++ b/osc/commandline.py
@@ -28,11 +28,11 @@ MAN_FOOTER = r"""
 Type 'osc help <subcommand>' for more detailed help on a specific subcommand.
 .PP
 For additional information, see
- * http://en.opensuse.org/Build_Service_Tutorial
- * http://en.opensuse.org/Build_Service/CLI
+ * http://wiki.opensuse.org/openSUSE:Build_Service_Tutorial
+ * http://wiki.opensuse.org/openSUSE:OSC
 .PP
 You can modify osc commands, or roll you own, via the plugin API:
- * http://en.opensuse.org/Build_Service/osc_plugins
+ * http://wiki.opensuse.org/openSUSE:OSC_plugins
 .SH AUTHOR
 osc was written by several authors. This man page is automatically generated.
 """
@@ -48,11 +48,11 @@ class Osc(cmdln.Cmdln):
     ${help_list}
     global ${option_list}
     For additional information, see
-    * http://en.opensuse.org/Build_Service_Tutorial
-    * http://en.opensuse.org/Build_Service/CLI
+    * http://wiki.opensuse.org/openSUSE:Build_Service_Tutorial
+    * http://wiki.opensuse.org/openSUSE:OSC
 
     You can modify osc commands, or roll you own, via the plugin API:
-    * http://en.opensuse.org/Build_Service/osc_plugins
+    * http://wiki.opensuse.org/openSUSE:OSC_plugins
     """
     name = 'osc'
     conf = None
@@ -724,7 +724,7 @@ class Osc(cmdln.Cmdln):
     def do_submitrequest(self, subcmd, opts, *args):
         """${cmd_name}: Create request to submit source into another Project
 
-        [See http://en.opensuse.org/Build_Service/Collaboration for information
+        [See http://wiki.opensuse.org/openSUSE:Build_Service_Collaboration for information
         on this topic.]
 
         See the "request" command for showing and modifing existing requests.
@@ -1383,8 +1383,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
     def do_changedevelrequest(self, subcmd, opts, *args):
         """${cmd_name}: Create request to change the devel package definition.
 
-        [See http://en.opensuse.org/Build_Service/Collaboration for information
-        on this topic.]
+        [See http://wiki.opensuse.org/openSUSE:Build_Service_Collaboration 
+        for information on this topic.]
 
         See the "request" command for showing and modifing existing requests.
 
@@ -1461,8 +1461,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
     def do_request(self, subcmd, opts, *args):
         """${cmd_name}: Show and modify requests
 
-        [See http://en.opensuse.org/Build_Service/Collaboration for information
-        on this topic.]
+        [See http://wiki.opensuse.org/openSUSE:Build_Service_Collaboration
+        for information on this topic.]
 
         This command shows and modifies existing requests. To create new requests
         you need to call one of the following:
@@ -1898,7 +1898,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
         This can be used to make packages available from building that are
         needed in a project but available only in a different project. Note
         that this is done at the expense of disk space. See
-        http://en.opensuse.org/Build_Service/Tips_and_Tricks#_link_and__aggregate
+        http://wiki.opensuse.org/openSUSE:Build_Service_Tips_and_Tricks#_link_and__aggregate
         for more information.
 
         The DESTPAC name is optional; the source packages' name will be used if
@@ -2029,8 +2029,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
     def do_mbranch(self, subcmd, opts, *args):
         """${cmd_name}: Multiple branch of a package
 
-        [See http://en.opensuse.org/Build_Service/Concepts/Maintenance for information
-        on this topic.]
+        [See http://wiki.opensuse.org/openSUSE:Build_Service_Concept_Maintenance
+        for information on this topic.]
 
         This command is used for creating multiple links of defined version of a package
         in one project. This is esp. used for maintenance updates.
@@ -2098,8 +2098,8 @@ Please submit there instead, or use --nodevelproject to force direct submission.
     def do_branch(self, subcmd, opts, *args):
         """${cmd_name}: Branch a package
 
-        [See http://en.opensuse.org/Build_Service/Collaboration for information
-        on this topic.]
+        [See http://wiki.opensuse.org/openSUSE:Build_Service_Collaboration
+        for information on this topic.]
 
         Create a source link from a package of an existing project to a new
         subproject of the requesters home project (home:branches:)
diff --git a/osc/core.py b/osc/core.py
index b748ba35..659899b9 100644
--- a/osc/core.py
+++ b/osc/core.py
@@ -127,7 +127,7 @@ new_package_templ = """\
   </useforbuild>
 
   Please have a look at:
-  http://en.opensuse.org/Restricted_Formats
+  http://wiki.opensuse.org/Restricted_formats
   Packages containing formats listed there are NOT allowed to
   be packaged in the openSUSE Buildservice and will be deleted!