diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 9cf5a268e..1690cfcdf 100644
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -276,6 +276,7 @@ secret door detection's trap finding is no longer blocked by water or clouds
 potion thrown by monster which hit a long worm's tail gave feedback about
 	hitting its head
 implement energy vortex's previously unused energy drain attack
+changing alignment type resets alignment record to 0 (nomimally aligned)
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/attrib.c b/src/attrib.c
index 138b3f2ac..0326c6f8a 100644
--- a/src/attrib.c
+++ b/src/attrib.c
@@ -704,7 +704,7 @@ int propidx;	/* special cases can have negative values */
 
 	    /* remove some verbosity and/or redundancy */
 	    if ((p = strstri(buf, " pair of ")) != 0)
-		do ++p; while ((*p = *(p + 8)) != '\0');
+		copynchars(p + 1, p + 9, BUFSZ); /* overlapping buffers ok */
 	    else if (propidx == STRANGLED &&
 		    (p = strstri(buf, " of strangulation")) != 0)
 		*p = '\0';
@@ -948,7 +948,10 @@ int reason;	/* 0==conversion, 1==helm-of-OA on, 2==helm-of-OA off */
 		 "back in sync with your body");
     }
 
-    if (u.ualign.type != oldalign) retouch_equipment(0);
+    if (u.ualign.type != oldalign) {
+	u.ualign.record = 0;	/* slate is wiped clean */
+	retouch_equipment(0);
+    }
 }
 
 /*attrib.c*/
diff --git a/src/pray.c b/src/pray.c
index ebb77fbf2..bfd0e3bf8 100644
--- a/src/pray.c
+++ b/src/pray.c
@@ -1,4 +1,4 @@
-/*	SCCS Id: @(#)pray.c	3.5	2007/05/29	*/
+/*	SCCS Id: @(#)pray.c	3.5	2008/01/21	*/
 /* Copyright (c) Benson I. Margulies, Mike Stephenson, Steve Linhart, 1989. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1439,7 +1439,6 @@ verbalize("In return for thy service, I grant thee the gift of Immortality!");
 		    /* Beware, Conversion is costly */
 		    change_luck(-3);
 		    u.ublesscnt += 300;
-		    adjalign((int)(u.ualignbase[A_ORIGINAL] * (ALIGNLIM / 2)));
 		} else {
 		    u.ugangr += 3;
 		    adjalign(-5);