diff --git a/changelog b/changelog
index 6a9b22d..41f3912 100644
--- a/changelog
+++ b/changelog
@@ -36,6 +36,8 @@ Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
 (lots of major bugfixes too)
 @
 tbaMUD 3.61
+[Jan 18 2010] - Fizban
+  Edited scuba check so immortals with nohassle on don't need one.
 [Jan 18 2010] - Rumble
   Fixed bad AFF_SCUBA check for underwater rooms.
 [Dec 28 2009] - Rumble
diff --git a/src/act.movement.c b/src/act.movement.c
index f5070d0..75b1b9a 100644
--- a/src/act.movement.c
+++ b/src/act.movement.c
@@ -197,7 +197,7 @@ int do_simple_move(struct char_data *ch, int dir, int need_specials_check)
   /* Underwater Room: Does lack of underwater breathing prevent movement? */
   if ((SECT(was_in) == SECT_UNDERWATER) || (SECT(going_to) == SECT_UNDERWATER))
   {
-    if (!has_scuba(ch)) {
+    if (!has_scuba(ch) && !PRF_FLAGGED(ch, PRF_NOHASSLE)) {
       send_to_char(ch, "You need to be able to breathe water to go there!\r\n");
       return (0);
     }