diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt
index d507e993d9..bd55629c54 100644
--- a/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@ -1389,6 +1389,7 @@ if hero shattered an unseen monster's weapon, the [also unseen] weapon was
 don't self-genocide if a monk picks "master-lich" or "masterlich" as target
 	(was matching "Master" rank)
 Sunsword can be invoked to create a blinding ray
+Excalibur is much harder to get if hero is not a knight
 
 
 Fixes to 3.7.0-x General Problems Exposed Via git Repository
diff --git a/src/fountain.c b/src/fountain.c
index 492ebf6e88..0ca38f795d 100644
--- a/src/fountain.c
+++ b/src/fountain.c
@@ -398,7 +398,8 @@ dipfountain(struct obj *obj)
         return;
     }
 
-    if (obj->otyp == LONG_SWORD && u.ulevel >= 5 && !rn2(6)
+    if (obj->otyp == LONG_SWORD && u.ulevel >= 5
+        && !rn2(Role_if(PM_KNIGHT) ? 6 : 30)
         /* once upon a time it was possible to poly N daggers into N swords */
         && obj->quan == 1L && !obj->oartifact
         && !exist_artifact(LONG_SWORD, artiname(ART_EXCALIBUR))) {