diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index ebdc34e188496f0b5a3ce1ababab11fb046eb959..2117b7f80d4c0bc8e28e87140037f8c68062357f 100644
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -507,7 +507,7 @@ check_is_super_user(ClusterInfo *cluster)
 /*
  *	check_for_isn_and_int8_passing_mismatch()
  *
- *	/contrib/isn relies on data type int8, and in 8.4 int8 can now be passed
+ *	contrib/isn relies on data type int8, and in 8.4 int8 can now be passed
  *	by value.  The schema dumps the CREATE TYPE PASSEDBYVALUE setting so
  *	it must match for the old and new servers.
  */
@@ -519,7 +519,7 @@ check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster)
 	bool		found = false;
 	char		output_path[MAXPGPATH];
 
-	prep_status("Checking for /contrib/isn with bigint-passing mismatch");
+	prep_status("Checking for contrib/isn with bigint-passing mismatch");
 
 	if (old_cluster.controldata.float8_pass_by_value ==
 		new_cluster.controldata.float8_pass_by_value)
@@ -581,12 +581,12 @@ check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster)
 	{
 		pg_log(PG_REPORT, "fatal\n");
 		pg_log(PG_FATAL,
-			   "| Your installation contains \"/contrib/isn\" functions\n"
+			   "| Your installation contains \"contrib/isn\" functions\n"
 			   "| which rely on the bigint data type.  Your old and\n"
 			   "| new clusters pass bigint values differently so this\n"
 			   "| cluster cannot currently be upgraded.  You can\n"
-			   "| manually upgrade data that use \"/contrib/isn\"\n"
-			   "| facilities and remove \"/contrib/isn\" from the\n"
+			   "| manually upgrade data that use \"contrib/isn\"\n"
+			   "| facilities and remove \"contrib/isn\" from the\n"
 			   "| old cluster and restart the upgrade.  A list\n"
 			   "| of the problem functions is in the file:\n"
 			   "| \t%s\n\n", output_path);
diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
index 5ce4b95b0696be430967b35527eb818e77a0a88c..c282ec2452d6a7a4cd1541dbee783167861e6c22 100644
--- a/contrib/pg_upgrade/controldata.c
+++ b/contrib/pg_upgrade/controldata.c
@@ -330,7 +330,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
 				pg_log(PG_FATAL, "%d: controldata retrieval problem\n", __LINE__);
 
 			p++;				/* removing ':' char */
-			/* used later for /contrib check */
+			/* used later for contrib check */
 			cluster->controldata.float8_pass_by_value = strstr(p, "by value") != NULL;
 			got_float8_pass_by_value = true;
 		}
diff --git a/doc/src/sgml/release-9.1.sgml b/doc/src/sgml/release-9.1.sgml
index 280e0bb142496b9e08b207ad18027e299df3ab49..713e89bee5bb5b5d5365ca5db095dd771019de4a 100644
--- a/doc/src/sgml/release-9.1.sgml
+++ b/doc/src/sgml/release-9.1.sgml
@@ -2272,7 +2272,7 @@
 
      <listitem>
       <para>
-       Modify <filename>/contrib</> modules and stored procedure
+       Modify <filename>contrib</> modules and stored procedure
        languages to install via the new <link
        linkend="extension">extension</link> mechanism (Tom Lane,
        Dimitri Fontaine)