diff --git a/Makefile b/Makefile
index ea9bd3f..f254255 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
 
 PREFIX ?= /usr/local
 
-UPLOAD = werner@sita.openmoko.org:public_html/fped/
+UPLOAD = www-data@downloads.qi-hardware.com:werner/fped/
 
 OBJS = fped.o expr.o coord.o obj.o delete.o inst.o util.o error.o \
        unparse.o file.o dump.o kicad.o postscript.o meas.o \
diff --git a/README b/README
index e9604e8..d4dced0 100644
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ that can be performed through the GUI.
 This README describes only the footprint definition language. A
 description of the GUI can be found here:
 
-http://people.openmoko.org/werner/fped/gui.html
+http://downloads.qi-hardware.com/people/werner/fped/gui.html
 
 This work is distributed under the terms of the GNU GENERAL PUBLIC
 LICENSE, Version 2:
@@ -42,12 +42,12 @@ Prerequisites:
 
 Check out the repository:
 
-  svn co http://svn.openmoko.org/trunk/eda/fped
+  git clone git://projects.qi-hardware.com/fped.git
   cd fped
 
 Get updates:
 
-  svn update
+  git pull
 
 Compile:
 
@@ -525,7 +525,7 @@ GUI
 ---
 
 Part of the GUI is described in
-http://people.openmoko.org/werner/fped/gui.html
+http://downloads.qi-hardware.com/people/werner/fped/gui.html
 
 
 Keyboard shortcuts
diff --git a/debian/control b/debian/control
index 4970daf..259a118 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>=  7.4.10), pkg-config,
 	imagemagick, transfig, netpbm, ghostscript,
 	libgtk2.0-dev 
 Standards-Version: 3.9.1
-Homepage: http://people.openmoko.org/werner/fped/gui.html
+Homepage: http://downloads.qi-hardware.com/people/werner/fped/gui.html
 
 Package: fped
 Architecture: any
@@ -20,5 +20,5 @@ Description: Footprint editor
  the textual definition also has a straightforward equivalent operation
  that can be performed through the GUI.
  A description of the GUI can be found here:
- http://people.openmoko.org/werner/fped/gui.html
+ http://downloads.qi-hardware.com/people/werner/fped/gui.html
 
diff --git a/debian/copyright b/debian/copyright
index 2fbbba6..5f40125 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,11 +8,11 @@ It was downloaded from:
 
 Upstream Author(s):
 
-    Werner Almesberger <werner@openmoko.org>
+    Werner Almesberger <werner@almesberger.net>
 
 Copyright:
 
-    Copyright 2009, 2010 by Werner Almesberger
+    Copyright 2009-2011 by Werner Almesberger
 
 License:
 
diff --git a/fped.1 b/fped.1
index e5f1d39..c2e2158 100644
--- a/fped.1
+++ b/fped.1
@@ -15,7 +15,7 @@ The language is constrained such that anything that can be expressed in
 the textual definition also has a straightforward equivalent operation
 that can be performed through the GUI.
 A description of the GUI can be found here:
-http://people.openmoko.org/werner/fped/gui.html
+http://downloads.qi-hardware.com/people/werner/fped/gui.html
 .SH OPTIONS
 .TP
 \fB\-k\fR
@@ -40,12 +40,12 @@ cpp_option
 \fB\-Idir\fR, \fB\-Dname\fR[=\fIvalue\fR], or \fB\-Uname\fR
 .PP
 Please report any further bugs at
-.B werner@openmoko.org
+.B werner@almesberger.net
 .SH LICENCE
 .B fped
 is covered by the GNU General Public License (GPL), version 2 or later.
 .SH AUTHORS
-Werner Almesberger <werner@openmoko.org>
+Werner Almesberger <werner@almesberger.net>
 .PP
 This manual page was written by Xiangfu Liu <xiangfu@sharism.cc>
 It is licensed under the terms of the GNU GPL (version 2 or later).