diff --git a/CHANGES b/CHANGES
index d3ef2754a3c46e61d8d460dde0f14194a472a89b..3be7a475fc503a6c4d6c1ecd255b22c6fa5ea699 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@
                                   Changelog
 
 Daniel (13 January 2004)
+- Luke Call made the win32 version of the password prompting function support
+  backspace.
+
 - Dan Fandrich fixed the hugehelp source file to contain both a compressed and
   an uncompressed version in the distribution, so that more people easier can
   build curl with the compressed version.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1637a1c3fed9651a26704ab9e4ec385cedf5343e..4e59fd34cf63988b07eb1a39b3706ae6f7d5f10e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -19,6 +19,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o the win32 password prompting supports backspace
  o builds natively on AmigaOS (without unix emulation)
  o ftps:// now uses port 990 by default
  o the "configure --with-spnego" action was improved
@@ -79,6 +80,6 @@ advice from friends like these:
  W. Rozycki, Nicolas Croiset, Josh Kapell, Gaz Iqbal, Dave May, Markus
  Moeller, James Clancy, Giuseppe Attardi, swalkaus at yahoo.com, Steve Green,
  Marty Kuhrt, Dominick Meglio, Diego Casorran, David Byron, John McGowan,
- David J Meyer, Dan Fandrich, Pierre, Brian R Duffy
+ David J Meyer, Dan Fandrich, Pierre, Brian R Duffy, Luke Call
  
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/src/getpass.c b/src/getpass.c
index 225f7f04eca5b3e5a4253eba5a3575b62760bc88..77e950c9dc54e5f4f159c91d899963f16f2e585c 100644
--- a/src/getpass.c
+++ b/src/getpass.c
@@ -203,6 +203,11 @@ char *getpass_r(const char *prompt, char *buffer, int buflen)
       buffer[i] = 0;
       break;
     }
+    else
+      if ( buffer[i] == '\b')
+        /* remove this letter and if this is not the first key, remove the
+           previous one as well */
+        i = i - (i>=1?2:1);
   }
   /* if user didn't hit ENTER, terminate buffer */
   if (i==buflen)