diff -bruNX ignore.txt ..\official/src/apply.c ./src/apply.c
--- ..\official/src/apply.c	Mon Dec  8 01:39:14 2003
+++ ./src/apply.c	Mon Aug 22 11:04:08 2005
@@ -2415,6 +2415,16 @@
 	if ((mtmp = m_at(cc.x, cc.y)) != (struct monst *)0) {
 	    int oldhp = mtmp->mhp;
 
+		if (flags.confirm && mtmp->mpeaceful
+			&& !Confusion && !Hallucination && !Stunned
+			&& canspotmon(mtmp)) {
+			char qbuf[QBUFSZ];
+
+			Sprintf(qbuf, "Really attack %s?", mon_nam(mtmp));
+			if (yn(qbuf) != 'y')
+				return(0);
+		}
+
 	    bhitpos = cc;
 	    check_caitiff(mtmp);
 	    (void) thitmonst(mtmp, uwep);
@@ -2424,6 +2434,8 @@
 	     */
 	    if (mtmp->mhp < oldhp)
 		u.uconduct.weaphit++;
+		else if(mtmp->mpeaceful)
+			setmangry(mtmp);
 	} else
 	    /* Now you know that nothing is there... */
 	    pline(nothing_happens);