diff --git a/doc/README.txt b/doc/README.txt
index 6a4ef43f..ff311cf4 100644
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -50,7 +50,7 @@ The source code of Grafx2 should always be distributed along with the
 executable; You can normally find it in a packed archive whose name begins by
 "src". The source code is also available on the web site, either by accessing
 the Subversion repository:
-http://grafx2.googlecode.com/svn/trunk/
+svn://pulkomandy.tk/GrafX2/
 or you can find the latest versions as packed archives:
 http://code.google.com/p/grafx2/wiki/Downloads
 
@@ -65,7 +65,7 @@ http://code.google.com/p/grafx2/wiki/Compiling
 To watch the full credits list, in the program, click '?' then 'Credits'.
 
 Please report bugs and request features on the bugtracker:
-http://code.google.com/p/grafx2/issues/list
+http://pulkomandy.tk/projects/GrafX2/query
 
 E-mail: grafx2@googlegroups.com
 It's a public mailing-list, so be aware that your message will be visible at:
@@ -92,9 +92,9 @@ Short revision history :
   * 11/1996  2.0b90%   First public release, at the Wired'96.
   * 09/1995            Project starts.
 
-Check http://code.google.com/p/grafx2/source/list for (very) detailed changelog.
-Check http://code.google.com/p/grafx2/wiki/History for an overview of the new 
-features and bugfixes in each numbered version.
+Check http://pulkomandy.tk/projects/GrafX2/log/ for (very) detailed changelog.
+Check http://pulkomandy.tk/projects/GrafX2/wiki/History for an overview of the
+new features and bugfixes in each numbered version.
 
 === FINAL WORDS ===
 
diff --git a/install/WinInstaller.nsi b/install/WinInstaller.nsi
index fad3069c..cb891a03 100644
--- a/install/WinInstaller.nsi
+++ b/install/WinInstaller.nsi
@@ -187,7 +187,7 @@ Section "Grafx2" SecProgram
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Grafx2-SDL" \
                  "DisplayIcon" "$INSTDIR\gfx2.ico"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Grafx2-SDL" \
-                 "URLInfoAbout" "http://grafx2.googlecode.com"
+                 "URLInfoAbout" "http://grafx2.org"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Grafx2-SDL" \
                  "DisplayVersion" "2.4.wip2023"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Grafx2-SDL" \
diff --git a/install/WinInstaller_23.nsi b/install/WinInstaller_23.nsi
index cc8030a2..a849d175 100644
--- a/install/WinInstaller_23.nsi
+++ b/install/WinInstaller_23.nsi
@@ -171,7 +171,7 @@ Section "Grafx2" SecProgram
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Grafx2-SDL" \
                  "DisplayIcon" "$INSTDIR\gfx2.ico"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Grafx2-SDL" \
-                 "URLInfoAbout" "http://grafx2.googlecode.com"
+                 "URLInfoAbout" "http://grafx2.org"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Grafx2-SDL" \
                  "DisplayVersion" "2.3.1771"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Grafx2-SDL" \
diff --git a/src/buttons.c b/src/buttons.c
index 5438c79d..4ab65748 100644
--- a/src/buttons.c
+++ b/src/buttons.c
@@ -169,7 +169,7 @@ void Button_Message_initial(void)
   Print_in_window(130-4*26,112,"Copyright (c) 1996-2001 by",MC_Dark,MC_Light);
   Print_in_window(130-4*13,120,"Sunset Design",MC_Black,MC_Light);
   //Print_in_window( 120-4*13,128,"(placeholder)",MC_Dark,MC_Light);
-  Print_in_window(130-4*28,136,"http://grafx2.googlecode.com",MC_Dark,MC_Light);
+  Print_in_window(130-4*17,136,"http://grafx2.org",MC_Dark,MC_Light);
 
   Window_set_normal_button(56, 151, 71, 14, "Anim", 0, (Main_backups->Pages->Image_mode != IMAGE_MODE_ANIMATION), KEY_NONE);
   Window_set_normal_button(133, 151, 71, 14, "Layers", 0, (Main_backups->Pages->Image_mode != IMAGE_MODE_LAYERED), KEY_NONE);
diff --git a/src/helpfile.h b/src/helpfile.h
index a7ddf4a6..2ae19ae1 100644
--- a/src/helpfile.h
+++ b/src/helpfile.h
@@ -61,7 +61,7 @@ static const T_Help_table helptable_about[] =
   HELP_TITLE("        GRAFX 2   ")
   HELP_BOLD ("         \"Dragon's Layers\" Edition")
   HELP_BOLD ("  THE ULTIMATE MULTI-RESOLUTION GFX EDITOR")
-  HELP_TEXT ("       http://grafx2.googlecode.com")
+  HELP_TEXT ("             http://grafx2.org")
 #if defined(__MINT__)
   HELP_TEXT ("                atari build                ")
 #else
diff --git a/src/setup.c b/src/setup.c
index 52a529de..af32838c 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -178,9 +178,14 @@ void Set_config_directory(const char * program_dir, char * config_dir)
         const char* Config_SubDir = "GrafX2";
         config_parent_dir = getenv("APPDATA");
       #elif defined(__BEOS__) || defined(__HAIKU__)
-        // "~/.grafx2", the BeOS way
-        const char* Config_SubDir = ".grafx2";
-        config_parent_dir = getenv("$HOME");
+        // "`finddir B_USER_SETTINGS_DIRECTORY`/grafx2"
+        const char* Config_SubDir = "grafx2";
+        {
+          static char parent[MAX_PATH_CHARACTERS];
+          find_directory(B_USER_SETTINGS_DIRECTORY, 0, false, parent,
+            MAX_PATH_CHARACTERS);
+          config_parent_dir = parent;
+        }
       #elif defined(__macosx__)
         // "~/Library/Preferences/com.googlecode.grafx2"
         const char* Config_SubDir = "Library/Preferences/com.googlecode.grafx2";