diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
index 74f9340..3e82990 100644
--- a/vncviewer/Viewport.cxx
+++ b/vncviewer/Viewport.cxx
@@ -22,6 +22,7 @@
 #include <string.h>
 
 #include <FL/fl_draw.H>
+#include <FL/fl_ask.H>
 
 #include <rfb/CMsgWriter.h>
 #include <rfb/LogWriter.h>
@@ -54,7 +55,7 @@
 // Menu constants
 
 enum { ID_EXIT, ID_CTRL, ID_ALT, ID_MENUKEY, ID_CTRLALTDEL,
-       ID_REFRESH, ID_OPTIONS, ID_ABOUT, ID_DISMISS };
+       ID_REFRESH, ID_OPTIONS, ID_INFO, ID_ABOUT, ID_DISMISS };
 
 Viewport::Viewport(int w, int h, const rfb::PixelFormat& serverPF, CConn* cc_)
   : Fl_Widget(0, 0, w, h), cc(cc_), frameBuffer(NULL), pixelTrans(NULL),
@@ -452,6 +453,7 @@
   contextMenu->add(_("Refresh screen"), 0, NULL, (void*)ID_REFRESH, FL_MENU_DIVIDER);
 
   contextMenu->add(_("Options..."), 0, NULL, (void*)ID_OPTIONS, 0);
+  contextMenu->add(_("Connection info..."), 0, NULL, (void*)ID_INFO, 0);
   contextMenu->add(_("About TigerVNC viewer..."), 0, NULL, (void*)ID_ABOUT, FL_MENU_DIVIDER);
 
   contextMenu->add(_("Dismiss menu"), 0, NULL, (void*)ID_DISMISS, 0);
@@ -503,6 +505,10 @@
   case ID_OPTIONS:
     OptionsDialog::showDialog();
     break;
+  case ID_INFO:
+    fl_message_title(_("VNC connection info"));
+    fl_message(cc->connectionInfo());
+    break;
   case ID_ABOUT:
     about_vncviewer();
     break;