diff --git a/common/configure.ac b/common/configure.ac
index ab7829b..f151029 100644
--- a/common/configure.ac
+++ b/common/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.61])
-AC_INIT([librfb], [1.5.0a1], [http://www.tightvnc.com/bugs.html])
+AC_INIT([librfb], [1.5.0a1], [http://www.tigervnc.org])
 
 AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2])
 
diff --git a/common/jpeg/README_TightVNC.txt b/common/jpeg/README_TightVNC.txt
index 72d502d..c73070a 100644
--- a/common/jpeg/README_TightVNC.txt
+++ b/common/jpeg/README_TightVNC.txt
@@ -1,5 +1,5 @@
 This directory includes a copy of the Independent JPEG Group's JPEG
 library (see the README file for more information). Not all the files
-from the original distribution have been included into the TightVNC
+from the original distribution have been included into the TigerVNC
 codebase. To obtain the original library, please see the README file,
 section "ARCHIVE LOCATIONS".
diff --git a/common/rfb/HTTPServer.cxx b/common/rfb/HTTPServer.cxx
index e40d480..94f0609 100644
--- a/common/rfb/HTTPServer.cxx
+++ b/common/rfb/HTTPServer.cxx
@@ -150,7 +150,7 @@
   sprintf(buffer, "%s %d %s", "HTTP/1.1", result, text);
   OutStream& os=sock.outStream();
   writeLine(os, buffer);
-  writeLine(os, "Server: TightVNC/4.0");
+  writeLine(os, "Server: TigerVNC/4.0");
   time_t now = time(0);
   struct tm* tm = gmtime(&now);
   strftime(buffer, 1024, "Date: %a, %d %b %Y %H:%M:%S GMT", tm);
diff --git a/common/rfb/VNCServerST.h b/common/rfb/VNCServerST.h
index 0b8a2e6..ddd73c9 100644
--- a/common/rfb/VNCServerST.h
+++ b/common/rfb/VNCServerST.h
@@ -198,7 +198,7 @@
     // part of the framebuffer will be sent using JpegEncoder, on each update
     // request, as we expect that video data is changing continuously. By
     // default, this option is disabled, as it's rather a specialized feature
-    // and video selection GUI can confuse users of the TightVNC client.
+    // and video selection GUI can confuse users of the TigerVNC client.
     void enableVideoSelection(bool enable);
     bool isVideoSelectionEnabled() const;