diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 60b180885..70232fa60 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-19  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
+
+	* mount.cc (getmntent_r): Remove unused but set variable.
+
 2012-07-18  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
 
 	* cygwin.din (getmntent_r): Export.
diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc
index efd4d41c8..125f248e4 100644
--- a/winsup/cygwin/mount.cc
+++ b/winsup/cygwin/mount.cc
@@ -1903,7 +1903,7 @@ extern "C" struct mntent *
 getmntent_r (FILE *, struct mntent *mntbuf, char *buf, int buflen)
 {
   struct mntent *mnt = mount_table->getmntent (_my_tls.locals.iteration++);
-  int fsname_len, dir_len, type_len, opts_len, tmplen = buflen;
+  int fsname_len, dir_len, type_len, tmplen = buflen;
 
   if (!mnt)
     return NULL;
@@ -1911,7 +1911,6 @@ getmntent_r (FILE *, struct mntent *mntbuf, char *buf, int buflen)
   fsname_len = strlen (mnt->mnt_fsname) + 1;
   dir_len = strlen (mnt->mnt_dir) + 1;
   type_len = strlen (mnt->mnt_type) + 1;
-  opts_len = strlen (mnt->mnt_opts) + 1;
 
   snprintf (buf, buflen, "%s%c%s%c%s%c%s", mnt->mnt_fsname, '\0',
 	    mnt->mnt_dir, '\0', mnt->mnt_type, '\0', mnt->mnt_opts);