diff --git a/COPYRIGHT b/COPYRIGHT
index 1d8f7a5793..cc3214c9de 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -352,7 +352,7 @@ License: other
 Liberation Fonts
 -----------------
 calibre includes a copy of the liberation fonts, available from
-https://calibre.kovidgoyal.net/downloads/liberation-fonts
+https://calibre-ebook.com/downloads/liberation-fonts
 
 BSD License (for all the BSD licensed code indicated above)
 -----------------------------------------------------------
diff --git a/README b/README
index 945592e7ba..2c916fc7d7 100644
--- a/README
+++ b/README
@@ -4,10 +4,10 @@ devices. It can go out to the internet and fetch metadata for your books. \
 It can download newspapers and convert them into e-books for convenient \
 reading. It is cross platform, running on Linux, Windows and OS X.
 
-For screenshots: https://calibre.kovidgoyal.net/wiki/Screenshots
+For screenshots: https://calibre-ebook.com/demo
 
 For installation/usage instructions please see
-http://calibre.kovidgoyal.net
+http://calibre-ebook.com
 
 For source code access:
 bzr branch lp:calibre
diff --git a/resources/content_server/index.html b/resources/content_server/index.html
index f0ce14b3ca..3dcc093c13 100644
--- a/resources/content_server/index.html
+++ b/resources/content_server/index.html
@@ -7,11 +7,11 @@
         <script type="text/javascript" src="/static/date.js" charset="utf-8"></script>
 		<script type="text/javascript" src="/static/jquery.js" charset="utf-8"></script>
 		<script type="text/javascript" src="/static/gui.js" charset="utf-8"></script>
-		<link rel="icon" href="http://calibre.kovidgoyal.net/chrome/site/favicon.ico" type="image/x-icon" />
+		<link rel="icon" href="http://calibre-ebook.com/favicon.ico" type="image/x-icon" />
 	</head>
 	<body>
 	    <div id="banner">
-	        <a style="border: 0pt" href="http://calibre.kovidgoyal.net" alt="calibre" title="calibre"><img style="border:0pt" src="/static/calibre.png" alt="calibre" /></a>
+	        <a style="border: 0pt" href="http://calibre-ebook.com" alt="calibre" title="calibre"><img style="border:0pt" src="/static/calibre.png" alt="calibre" /></a>
         </div>
         
 	    <div id="search_box">
diff --git a/resources/recipes/nasa.recipe b/resources/recipes/nasa.recipe
index 2554349664..8c0b383344 100644
--- a/resources/recipes/nasa.recipe
+++ b/resources/recipes/nasa.recipe
@@ -13,7 +13,6 @@
 ##
 ##	Version 0.3-2008_2_28
 ##	Based on WIRED.py by David Chen, 2007, and newsweek.py, bbc.py, nytimes.py by Kovid Goyal
-##	https://calibre.kovidgoyal.net/wiki/UserProfiles
 ##
 ##	Usage:
 ##	>web2lrf --user-profile nasa.py
@@ -40,7 +39,7 @@ class NASA(BasicNewsRecipe):
     ## Don't grab articles more than 30 days old
     oldest_article = 30
 
-    preprocess_regexps = [(re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in 
+    preprocess_regexps = [(re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in
 		[
 		## Fix the encoding to UTF-8
 		(r'<meta http-equiv="Content-Type" content="text/html; charset=(\S+)"', lambda match : match.group().replace(match.group(1), 'UTF-8')),
@@ -53,12 +52,12 @@ class NASA(BasicNewsRecipe):
 
 		## Correctly embed in-line images by removing the surrounding javascript that will be ignored in the conversion
 		(r'<a.*?onclick.*?>.*?(<img .*?>)', lambda match: match.group(1),),
-		
+
 		## This removes header and footer information from each print version.
        	(r'<!-- Top Header starts -->.*?<!-- Body starts -->', lambda match : '<New Stuff>'),
 		(r'<hr align="center" width="200"><p align="center">.*?<!-- Press Release standard text ends -->', lambda match : '<New Stuff>'),
 		(r'<!-- Top Header starts -->.*?<!---->', lambda match : '<New Stuff>'),
-		
+
 		## This removes the "download image" of various sizes from the Image of the day.
 		(r'<div id="download_image_box_print">.*?<div id="caption_region_print">', lambda match : '<New Stuff>'),
 
diff --git a/setup/installer/osx/app/main.py b/setup/installer/osx/app/main.py
index d023dbcf00..e1819c9bfc 100644
--- a/setup/installer/osx/app/main.py
+++ b/setup/installer/osx/app/main.py
@@ -336,7 +336,7 @@ class Py2App(object):
                 NSAppleScriptEnabled=False,
                 NSHumanReadableCopyright='Copyright 2008, Kovid Goyal',
                 CFBundleGetInfoString=('calibre, an E-book management '
-                'application. Visit http://calibre.kovidgoyal.net for details.'),
+                'application. Visit http://calibre-ebook.com for details.'),
                 CFBundleIconFile='library.icns',
                 LSMultipleInstancesProhibited=True,
                 LSEnvironment=env
diff --git a/setup/installer/osx/freeze.py b/setup/installer/osx/freeze.py
index c62d9f7154..89e2945fc7 100644
--- a/setup/installer/osx/freeze.py
+++ b/setup/installer/osx/freeze.py
@@ -404,7 +404,7 @@ def main():
                          'packages' : ['PIL', 'Authorization', 'lxml', 'dns'],
                          'excludes' : ['IPython', 'PyQt4.uic.port_v3.proxy_base'],
                          'plist'    : { 'CFBundleGetInfoString' : '''calibre, an E-book management application.'''
-                                        ''' Visit http://calibre.kovidgoyal.net for details.''',
+                                        ''' Visit http://calibre-ebook.com for details.''',
                                         'CFBundleIdentifier':'net.kovidgoyal.calibre',
                                         'CFBundleShortVersionString':VERSION,
                                         'CFBundleVersion':APPNAME + ' ' + VERSION,
diff --git a/setup/installer/windows/wix-template.xml b/setup/installer/windows/wix-template.xml
index 1fa59ca07c..26394fe5b9 100644
--- a/setup/installer/windows/wix-template.xml
+++ b/setup/installer/windows/wix-template.xml
@@ -61,10 +61,10 @@
                              WorkingDirectory="APPLICATIONROOTDIRECTORY" />
                         <util:InternetShortcut Id="OnlineDocumentationShortcut"
                             Name="User Manual" Type="url"
-                               Target="http://calibre.kovidgoyal.net/user_manual"/>
+                               Target="http://calibre-ebook.com/user_manual"/>
                         <util:InternetShortcut Id="GetInvolvedS"
                             Name="Get Involved" Type="url"
-                               Target="http://calibre.kovidgoyal.net/wiki/Development"/>
+                            Target="http://calibre-ebook.com/get-involved"/>
 
                         <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
                         <RegistryValue Root="HKCU" Key="Software\Microsoft\{app}" Name="start_menu_shortcuts_installed" Type="integer" Value="1" KeyPath="yes"/>
diff --git a/setup/pypi.py b/setup/pypi.py
index 7c5d1a54d5..d7d8d038ef 100644
--- a/setup/pypi.py
+++ b/setup/pypi.py
@@ -18,7 +18,7 @@ class Metadata(object):
     version = __version__
     author = 'Kovid Goyal'
     author_email = 'kovid@kovidgoyal.net'
-    url = 'http://calibre.kovidgoyal.net'
+    url = 'http://calibre-ebook.com'
     description = 'E-book management application.'
     long_description = open('README', 'rb').read()
     license = 'GPL'
diff --git a/setup/upload.py b/setup/upload.py
index dcb988f883..b380dfdb1f 100644
--- a/setup/upload.py
+++ b/setup/upload.py
@@ -330,8 +330,6 @@ class UploadToServer(Command):
                 shell=True)
         check_call('scp dist/calibre-*.tar.gz.asc divok:%s/signatures/'%DOWNLOADS,
                 shell=True)
-        check_call('ssh divok bzr update /var/www/calibre.kovidgoyal.net/calibre/',
-                   shell=True)
         check_call('ssh divok bzr update /usr/local/calibre',
                    shell=True)
         check_call('''ssh divok echo %s \\> %s/latest_version'''\
diff --git a/src/calibre/ebooks/conversion/cli.py b/src/calibre/ebooks/conversion/cli.py
index 178561fcb5..e319104562 100644
--- a/src/calibre/ebooks/conversion/cli.py
+++ b/src/calibre/ebooks/conversion/cli.py
@@ -40,7 +40,7 @@ To get help on them specify the input and output file and then use the -h \
 option.
 
 For full documentation of the conversion system see
-''') + 'http://calibre.kovidgoyal.net/user_manual/conversion.html'
+''') + 'http://calibre-ebook.com/user_manual/conversion.html'
 
 def print_help(parser, log):
     help = parser.format_help().encode(preferred_encoding, 'replace')
diff --git a/src/calibre/ebooks/lrf/html/demo/demo.html b/src/calibre/ebooks/lrf/html/demo/demo.html
index 8a43b50708..7d2f783ccc 100644
--- a/src/calibre/ebooks/lrf/html/demo/demo.html
+++ b/src/calibre/ebooks/lrf/html/demo/demo.html
@@ -11,7 +11,7 @@
 </head>
   <h1>Demo of <span style='font-family:monospace'>html2lrf</span></h1>  
   <p>
-  This document contains a demonstration of the capabilities of <span style='font-family:monospace'>html2lrf</span>, the HTML to LRF converter   from <em>calibre.</em> To obtain calibre visit<br/><span style='font:sans-serif'>http://calibre.kovidgoyal.net</span>
+  This document contains a demonstration of the capabilities of <span style='font-family:monospace'>html2lrf</span>, the HTML to LRF converter   from <em>calibre.</em> To obtain calibre visit<br/><span style='font:sans-serif'>http://calibre-ebook.com</span>
   </p>
   <br/>
   <h2 id="toc">Table of Contents</h2>
diff --git a/src/calibre/gui2/convert/font_key.ui b/src/calibre/gui2/convert/font_key.ui
index 13daeb360d..41d355b9c6 100644
--- a/src/calibre/gui2/convert/font_key.ui
+++ b/src/calibre/gui2/convert/font_key.ui
@@ -33,7 +33,7 @@
      <property name="text">
       <string>&lt;p&gt;This wizard will help you choose an appropriate font size key for your needs. Just enter the base font size of the input document and then enter an input font size. The wizard will display what font size it will be mapped to, by the font rescaling algorithm. You can adjust the algorithm by adjusting the output base font size and font key below. When you find values suitable for you, click OK.&lt;/p&gt;
 &lt;p&gt;By default, if the output base font size is zero and/or no font size key is specified, calibre will use the values from the current Output Profile. &lt;/p&gt;
-&lt;p&gt;See the &lt;a href=&quot;http://calibre.kovidgoyal.net/user_manual/conversion.html#font-size-rescaling&quot;&gt;User Manual&lt;/a&gt; for a discussion of how font size rescaling works.&lt;/p&gt;</string>
+&lt;p&gt;See the &lt;a href=&quot;http://calibre-ebook.com/user_manual/conversion.html#font-size-rescaling&quot;&gt;User Manual&lt;/a&gt; for a discussion of how font size rescaling works.&lt;/p&gt;</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
diff --git a/src/calibre/gui2/convert/xpath_wizard.ui b/src/calibre/gui2/convert/xpath_wizard.ui
index 6f67312c47..52985653fe 100644
--- a/src/calibre/gui2/convert/xpath_wizard.ui
+++ b/src/calibre/gui2/convert/xpath_wizard.ui
@@ -127,7 +127,7 @@
    <item>
     <widget class="QLabel" name="label_5">
      <property name="text">
-      <string>&lt;p&gt;For example, to match all h2 tags that have class=&quot;chapter&quot;, set tag to &lt;i&gt;h2&lt;/i&gt;, attribute to &lt;i&gt;class&lt;/i&gt; and value to &lt;i&gt;chapter&lt;/i&gt;.&lt;/p&gt;&lt;p&gt;Leaving attribute blank will match any attribute and leaving value blank will match any value. Setting tag to * will match any tag.&lt;/p&gt;&lt;p&gt;To learn more advanced usage of XPath see the &lt;a href=&quot;http://calibre.kovidgoyal.net/user_manual/xpath.html&quot;&gt;XPath Tutorial&lt;/a&gt;.</string>
+      <string>&lt;p&gt;For example, to match all h2 tags that have class=&quot;chapter&quot;, set tag to &lt;i&gt;h2&lt;/i&gt;, attribute to &lt;i&gt;class&lt;/i&gt; and value to &lt;i&gt;chapter&lt;/i&gt;.&lt;/p&gt;&lt;p&gt;Leaving attribute blank will match any attribute and leaving value blank will match any value. Setting tag to * will match any tag.&lt;/p&gt;&lt;p&gt;To learn more advanced usage of XPath see the &lt;a href=&quot;http://calibre-ebook.com/user_manual/xpath.html&quot;&gt;XPath Tutorial&lt;/a&gt;.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
diff --git a/src/calibre/gui2/dialogs/search.ui b/src/calibre/gui2/dialogs/search.ui
index 5c28807bac..bbd7411583 100644
--- a/src/calibre/gui2/dialogs/search.ui
+++ b/src/calibre/gui2/dialogs/search.ui
@@ -112,7 +112,7 @@
       </size>
      </property>
      <property name="text" >
-      <string>See the &lt;a href="http://calibre.kovidgoyal.net/user_manual/gui.html#the-search-interface">User Manual&lt;/a> for more help</string>
+      <string>See the &lt;a href="http://calibre-ebook.com/user_manual/gui.html#the-search-interface">User Manual&lt;/a> for more help</string>
      </property>
      <property name="openExternalLinks" >
       <bool>true</bool>
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index 9068fdb6bd..a95572083e 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -214,7 +214,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
 
         ####################### Vanity ########################
         self.vanity_template  = _('<p>For help see the: <a href="%s">User Manual</a>'
-                '<br>')%'http://calibre.kovidgoyal.net/user_manual'
+                '<br>')%'http://calibre-ebook.com/user_manual'
         self.vanity_template += _('<b>%s</b>: %s by <b>Kovid Goyal '
             '%%(version)s</b><br>%%(device)s</p>')%(__appname__, __version__)
         self.latest_version = ' '
@@ -1721,12 +1721,13 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
                 <title>Donate to support calibre</title>
             </head>
             <body style="background:white">
-                <div><a href="http://calibre.kovidgoyal.net"><img style="border:0px" src="http://calibre.kovidgoyal.net/chrome/site/calibre_banner.png" alt="calibre" /></a></div>
+                <div><a href="http://calibre-ebook.com"><img style="border:0px"
+                src="file://%s" alt="calibre" /></a></div>
                 <p>Calibre %s</p>
                 %s
             </body>
         </html>
-        '''%(MSG, BUTTON)
+        '''%(P('content_server/calibre_banner.png').replace(os.sep, '/'), MSG, BUTTON)
         pt = PersistentTemporaryFile('_donate.htm')
         pt.write(HTML.encode('utf-8'))
         pt.close()
@@ -1812,7 +1813,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
 
     def update_found(self, version):
         os = 'windows' if iswindows else 'osx' if isosx else 'linux'
-        url = 'http://%s.kovidgoyal.net/download_%s'%(__appname__, os)
+        url = 'http://calibre-ebook.com/download_%s'%os
         self.latest_version = '<br>' + _('<span style="color:red; font-weight:bold">'
                 'Latest version: <a href="%s">%s</a></span>')%(url, version)
         self.vanity.setText(self.vanity_template%\
@@ -1823,10 +1824,10 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
                 dynamic.get('update to version %s'%version, True):
             if question_dialog(self, _('Update available'),
                     _('%s has been updated to version %s. '
-                    'See the <a href="http://calibre.kovidgoyal.net/wiki/'
-                    'Changelog">new features</a>. Visit the download pa'
+                    'See the <a href="http://calibre-ebook.com/whats-new'
+                    '">new features</a>. Visit the download pa'
                     'ge?')%(__appname__, version)):
-                url = 'http://calibre.kovidgoyal.net/download_'+\
+                url = 'http://calibre-ebook.com/download_'+\
                     ('windows' if iswindows else 'osx' if isosx else 'linux')
                 QDesktopServices.openUrl(QUrl(url))
             dynamic.set('update to version %s'%version, False)
diff --git a/src/calibre/gui2/wizard/finish.ui b/src/calibre/gui2/wizard/finish.ui
index a933264b81..8a3275a091 100644
--- a/src/calibre/gui2/wizard/finish.ui
+++ b/src/calibre/gui2/wizard/finish.ui
@@ -46,7 +46,7 @@
    <item>
     <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>&lt;h2&gt;Demo videos&lt;/h2&gt;Videos demonstrating the various features of calibre are available &lt;a href=&quot;http://calibre.kovidgoyal.net/downloads/videos/&quot;&gt;online&lt;/a&gt;.</string>
+         <string>&lt;h2&gt;Demo videos&lt;/h2&gt;Videos demonstrating the various features of calibre are available &lt;a href=&quot;http://calibre-ebook.com/demo&quot;&gt;online&lt;/a&gt;.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -75,7 +75,7 @@
    <item>
     <widget class="QLabel" name="label_3">
      <property name="text">
-      <string>&lt;h2&gt;User Manual&lt;/h2&gt;A User Manual is also available &lt;a href=&quot;http://calibre.kovidgoyal.net/user_manual&quot;&gt;online&lt;/a&gt;.</string>
+      <string>&lt;h2&gt;User Manual&lt;/h2&gt;A User Manual is also available &lt;a href=&quot;http://calibre-ebook.com/user_manual&quot;&gt;online&lt;/a&gt;.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py
index 102ace97ba..50f0c6d48a 100644
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@@ -64,7 +64,7 @@ STANZA_TEMPLATE='''\
   <title>calibre Library</title>
   <author>
     <name>calibre</name>
-    <uri>http://calibre.kovidgoyal.net</uri>
+    <uri>http://calibre-ebook.com</uri>
   </author>
   <id>$id</id>
   <updated>${updated.strftime('%Y-%m-%dT%H:%M:%SZ')}</updated>
diff --git a/src/calibre/library/server.py b/src/calibre/library/server.py
index 15746cbc61..88eb775ea7 100644
--- a/src/calibre/library/server.py
+++ b/src/calibre/library/server.py
@@ -176,7 +176,7 @@ class LibraryServer(object):
     }
 
     </style>
-    <link rel="icon" href="http://calibre.kovidgoyal.net/chrome/site/favicon.ico" type="image/x-icon" />
+    <link rel="icon" href="http://calibre-ebook.com/favicon.ico" type="image/x-icon" />
     </head>
     <body>
         <div id="logo">
@@ -276,7 +276,7 @@ class LibraryServer(object):
       ${Markup(next_link)}
       <author>
         <name>calibre</name>
-        <uri>http://calibre.kovidgoyal.net</uri>
+        <uri>http://calibre-ebook.com</uri>
       </author>
       <subtitle>
             ${subtitle}
@@ -296,7 +296,7 @@ class LibraryServer(object):
       <link rel="search" title="Search" type="application/atom+xml" href="/stanza/?search={searchTerms}"/>
       <author>
         <name>calibre</name>
-        <uri>http://calibre.kovidgoyal.net</uri>
+        <uri>http://calibre-ebook.com</uri>
       </author>
       <subtitle>
             ${subtitle}
diff --git a/src/calibre/manual/conf.py b/src/calibre/manual/conf.py
index dd54e13271..b00a454237 100644
--- a/src/calibre/manual/conf.py
+++ b/src/calibre/manual/conf.py
@@ -120,7 +120,7 @@ html_copy_source = False
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'calibredoc'
 
-html_use_opensearch = 'http://calibre.kovidgoyal.net/user_manual'
+html_use_opensearch = 'http://calibre-ebook.com/user_manual'
 
 html_show_sphinx = False
 
diff --git a/src/calibre/manual/customize.rst b/src/calibre/manual/customize.rst
index 149a139216..abf3165a69 100644
--- a/src/calibre/manual/customize.rst
+++ b/src/calibre/manual/customize.rst
@@ -54,7 +54,7 @@ That's all. To add this code to |app| as a plugin, simply create a zip file with
     zip plugin.zip my_plugin.py
 
 You can download the Hello World plugin from 
-`helloworld_plugin.zip  <http://calibre.kovidgoyal.net/downloads/helloworld_plugin.zip>`_. 
+`helloworld_plugin.zip  <http://calibre-ebook.com/downloads/helloworld_plugin.zip>`_. 
 Now either use the configuration dialog in |app| GUI to add this zip file as a plugin, or
 use the command::
 
diff --git a/src/calibre/manual/develop.rst b/src/calibre/manual/develop.rst
index fa1bffacfb..06c7652e3c 100644
--- a/src/calibre/manual/develop.rst
+++ b/src/calibre/manual/develop.rst
@@ -65,7 +65,7 @@ this, make your changes, then run::
     bzr send -o my-changes
 
 This will create a :file:`my-changes` file in the current directory,
-simply attach that to a ticket on the |app| `bug tracker <http://calibre.kovidgoyal.net/newticket>`_.
+simply attach that to a ticket on the |app| `bug tracker <http://bugs.calibre-ebook.com/newticket>`_.
 
 If you plan to do a lot of development on |app|, then the best method is to create a 
 `Launchpad <http://launchpad.net>`_ account. Once you have the account, you can use it to register
diff --git a/src/calibre/manual/faq.rst b/src/calibre/manual/faq.rst
index f9d1882b9a..75becf7e17 100644
--- a/src/calibre/manual/faq.rst
+++ b/src/calibre/manual/faq.rst
@@ -69,8 +69,7 @@ There are two aspects to this problem:
 How do I use some of the advanced features of the conversion tools?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  You can get help on any individual feature of the converters by mousing over it in the GUI or running ``ebook-convert dummy.html .epub -h`` at a terminal. A good place to start is to look at the following demo files that demonstrate some of the advanced features: 
-  * `html-demo.zip <http://calibre.kovidgoyal.net/downloads/html-demo.zip>`_ 
-  * `txt-demo.zip <http://calibre.kovidgoyal.net/downloads/txt-demo.zip>`_
+  * `html-demo.zip <http://calibre-ebook.com/downloads/html-demo.zip>`_ 
 
 
 Device Integration
@@ -232,7 +231,7 @@ I want |app| to download news from my favorite news website.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 If you are reasonably proficient with computers, you can teach |app| to download news from any website of your choosing. To learn how to do this see :ref:`news`.
 
-Otherwise, you can register a request for a particular news site by adding a comment `here <http://calibre.kovidgoyal.net/ticket/405>`_.
+Otherwise, you can register a request for a particular news site by adding a comment `here <http://bugs.calibre-ebook.com/ticket/405>`_.
 
 Can I use web2disk to download an arbitrary website?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -285,5 +284,5 @@ Most purchased EPUB books have `DRM <http://wiki.mobileread.com/wiki/DRM>`_. Thi
 I want some feature added to |app|. What can I do?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 You have two choices: 
- 1. Create a patch by hacking on |app| and send it to me for review and inclusion. See `Development <http://calibre.kovidgoyal.net/wiki/Development>`_. 
- 2. `Open a ticket <http://calibre.kovidgoyal.net/newticket>`_ (you have to register and login first) and hopefully I will find the time to implement your feature.
+ 1. Create a patch by hacking on |app| and send it to me for review and inclusion. See `Development <http://calibre-ebook.com/get-involved>`_. 
+ 2. `Open a ticket <http://bugs.calibre-ebook.com/newticket>`_ (you have to register and login first) and hopefully I will find the time to implement your feature.
diff --git a/src/calibre/manual/news.rst b/src/calibre/manual/news.rst
index 6365e285af..de50fd1c19 100644
--- a/src/calibre/manual/news.rst
+++ b/src/calibre/manual/news.rst
@@ -270,7 +270,9 @@ Once the download is complete, you can look at the downloaded :term:`HTML` by op
     ...
 
 
-If you're satisfied with your recipe, consider attaching it to `the wiki <http://calibre.kovidgoyal.net/wiki/UserRecipes>`_, so that others can use it as well. If you feel there is enough demand to justify its inclusion into the set of built-in recipes, add a comment to the ticket http://calibre.kovidgoyal.net/ticket/405
+If you're satisfied with your recipe, and you feel there is enough demand to justify its inclusion into the set of built-in recipes, add a comment to the ticket http://bugs.calibre-ebook.com/ticket/405
+
+Alternatively, you could just post your recipe in the calibre forum at http://www.mobileread.com/forums/forumdisplay.php?f=166 to share it with other calibre users.
 
 
 .. seealso::
diff --git a/src/calibre/manual/templates/layout.html b/src/calibre/manual/templates/layout.html
index 606fc69386..c5a857650f 100644
--- a/src/calibre/manual/templates/layout.html
+++ b/src/calibre/manual/templates/layout.html
@@ -1,7 +1,7 @@
 {% extends "!layout.html" %}
 {% block sidebarlogo %}
         <p class="logo">
-            <a href="http://calibre.kovidgoyal.net"><img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/></a>
+            <a href="http://calibre-ebook.com"><img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/></a>
         </p>
          <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
                <input type="hidden" name="cmd" value="_s-xclick" />
diff --git a/src/calibre/utils/help2man.py b/src/calibre/utils/help2man.py
index 173d760864..5b2a225173 100644
--- a/src/calibre/utils/help2man.py
+++ b/src/calibre/utils/help2man.py
@@ -51,7 +51,7 @@ def create_man_page(prog, parser):
 
     lines += ['.SH SEE ALSO',
               'The User Manual is available at '
-              'http://calibre.kovidgoyal.net/user_manual',
+              'http://calibre-ebook.com/user_manual',
               '.PP', '.B Created by '+__author__]
 
     lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for
