diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 2db0afe15..0bc042f24 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-18  Corinna Vinschen  <corinna@vinschen.de>
+
+	* mmap.cc (mmap_record::alloc_fh): Initialize nmae strings in fdev to
+	empty strings or suffer a SEGV.  Drop second parameter in call to
+	build_fh_dev.
+
 2011-03-18  Corinna Vinschen  <corinna@vinschen.de>
 
 	* mmap.cc (class mmap_record): Pack 4 byte-aligned.  Convert member dev
diff --git a/winsup/cygwin/mmap.cc b/winsup/cygwin/mmap.cc
index 4d29d5f5c..91c2d7bc7 100644
--- a/winsup/cygwin/mmap.cc
+++ b/winsup/cygwin/mmap.cc
@@ -522,8 +522,9 @@ mmap_record::alloc_fh ()
      of the correct type to be sure to call the method of the
      correct class. */
   device fdev;
+  fdev.name = fdev.native = "";
   fdev.parse (get_device ());
-  fhandler_base *fh = build_fh_dev (fdev, "");
+  fhandler_base *fh = build_fh_dev (fdev);
   fh->set_access (get_openflags ());
   return fh;
 }