diff --git a/examples/osgvnc/CMakeLists.txt b/examples/osgvnc/CMakeLists.txt
index a6e8092f6..96d337812 100644
--- a/examples/osgvnc/CMakeLists.txt
+++ b/examples/osgvnc/CMakeLists.txt
@@ -1,9 +1,5 @@
 SET(TARGET_SRC osgvnc.cpp)
 
-SET(TARGET_EXTERNAL_LIBRARIES ${LIBVNCCLIENT_LIBRARY} ${ZLIB_LIBRARY} ${JPEG_LIBRARY} )
-
-INCLUDE_DIRECTORIES(${LIBVNCCLIENT_INCLUDE_DIR})
-
 #### end var setup  ###
 SETUP_EXAMPLE(osgvnc)
 
diff --git a/examples/osgvnc/osgvnc.cpp b/examples/osgvnc/osgvnc.cpp
index 306bb1c5c..2c54e3ed7 100644
--- a/examples/osgvnc/osgvnc.cpp
+++ b/examples/osgvnc/osgvnc.cpp
@@ -10,300 +10,18 @@
 #include <iostream>
 #include <osg/io_utils>
 
-extern "C" {
-#include <rfb/rfbclient.h>
-}
+#include <osgDB/ReadFile>
 
-class VncImage : public osg::Image
+
+osg::Node* createInteractiveQuad(const osg::Vec3& origin, osg::Vec3& widthAxis, osg::Vec3& heightAxis, 
+                                 osg::Image* image)
 {
-    public:
-    
-        VncImage();
+    bool flip = image->getOrigin()==osg::Image::TOP_LEFT;
 
-        bool connect(int* argc, char** argv);
-        
-        void close();
-
-        static rfbBool resizeImage(rfbClient* client);
-        
-        static void updateImage(rfbClient* client,int x,int y,int w,int h);
-        
-    protected:
-    
-        virtual ~VncImage();
-
-        class RfbThread : public osg::Referenced, public OpenThreads::Thread
-        {
-        public:
-
-            RfbThread(rfbClient* client):
-                _client(client),
-                _done(false) {}
-
-            virtual ~RfbThread()
-            {
-                _done = true;
-                cancel();
-                while(isRunning()) 
-                {
-                    OpenThreads::Thread::YieldCurrentThread();
-                }
-            }
-
-            virtual void run()
-            {
-                do
-                {
-                    int i=WaitForMessage(_client,500);
-                    if(i<0)
-                        return;
-                    if(i)
-                        if(!HandleRFBServerMessage(_client))
-                        return;
-
-                } while (!_done && !testCancel());
-            }
-
-            rfbClient*  _client;
-            bool        _done;
-
-        };
-
-    public:
-
-        rfbClient* _client;
-
-        osg::ref_ptr<RfbThread> _rfbThread;
-      
-};
-
-VncImage::VncImage()
-{
-    // setPixelBufferObject(new osg::PixelBufferObject(this);
-
-}
-
-VncImage::~VncImage()
-{
-    close();
-}
-
-bool VncImage::connect(int* argc, char** argv)
-{
-    if (_client) close();
-
-    _client = rfbGetClient(8,3,4);
-    _client->canHandleNewFBSize = TRUE;
-    _client->MallocFrameBuffer = resizeImage;
-    _client->GotFrameBufferUpdate = updateImage;
-    _client->HandleKeyboardLedState = 0;
-    _client->HandleTextChat = 0;
-
-    rfbClientSetClientData(_client, 0, this);
-    
-    if (rfbInitClient(_client,argc,argv))
-    {
-        _rfbThread = new RfbThread(_client);
-        _rfbThread->startThread();
-    }
-}
-
-void VncImage::close()
-{
-    if (_rfbThread.valid())
-    {
-        // stop the client thread
-        _rfbThread = 0;
-    }
-
-    if (_client)
-    {
-        // close the client
-        rfbClientCleanup(_client);
-        _client = 0;
-    }
-}
-
-
-rfbBool VncImage::resizeImage(rfbClient* client) 
-{
-    osg::Image* image = (osg::Image*)(rfbClientGetClientData(client, 0));
-    
-    int width=client->width;
-    int height=client->height;
-    int depth=client->format.bitsPerPixel;
-
-    std::cout<<"resize "<<width<<", "<<height<<", "<<depth<<" image = "<<image<<std::endl;
-
-    image->allocateImage(width,height,1,GL_RGBA,GL_UNSIGNED_BYTE);
-    
-    client->frameBuffer= (uint8_t*)(image->data());
-    
-    return TRUE;
-}
-
-void VncImage::updateImage(rfbClient* client,int x,int y,int w,int h)
-{
-    osg::Image* image = (osg::Image*)(rfbClientGetClientData(client, 0));
-    image->dirty();
-}
-
-
-class RfbEventHandler : public osgGA::GUIEventHandler
-{
-public:
-
-    RfbEventHandler(rfbClient* client):
-        _client(client) {}
-    
-    virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa, osg::Object*, osg::NodeVisitor* nv);
-    
-    rfbKeySym key2rfbKeySym(int key)
-    {
-        return rfbKeySym(key);
-    }
-
-protected:
-
-    virtual ~RfbEventHandler() {}
-    
-    bool mousePosition(osgViewer::View* view, osg::NodeVisitor* nv, const osgGA::GUIEventAdapter& ea, int& x, int &y) const;
-
-    rfbClient*  _client;
-    
-};
-
-bool RfbEventHandler::mousePosition(osgViewer::View* view, osg::NodeVisitor* nv, const osgGA::GUIEventAdapter& ea, int& x, int &y) const
-{
-    osgUtil::LineSegmentIntersector::Intersections intersections;
-    bool foundIntersection = view==0 ? false :
-        (nv==0 ? view->computeIntersections(ea.getX(), ea.getY(), intersections) :
-                 view->computeIntersections(ea.getX(), ea.getY(), nv->getNodePath(), intersections));
-
-    if (foundIntersection)
-    {
-
-        osg::Vec2 tc(0.5f,0.5f);
-
-        // use the nearest intersection                 
-        const osgUtil::LineSegmentIntersector::Intersection& intersection = *(intersections.begin());
-        osg::Drawable* drawable = intersection.drawable.get();
-        osg::Geometry* geometry = drawable ? drawable->asGeometry() : 0;
-        osg::Vec3Array* vertices = geometry ? dynamic_cast<osg::Vec3Array*>(geometry->getVertexArray()) : 0;
-        if (vertices)
-        {
-            // get the vertex indices.
-            const osgUtil::LineSegmentIntersector::Intersection::IndexList& indices = intersection.indexList;
-            const osgUtil::LineSegmentIntersector::Intersection::RatioList& ratios = intersection.ratioList;
-
-            if (indices.size()==3 && ratios.size()==3)
-            {
-                unsigned int i1 = indices[0];
-                unsigned int i2 = indices[1];
-                unsigned int i3 = indices[2];
-
-                float r1 = ratios[0];
-                float r2 = ratios[1];
-                float r3 = ratios[2];
-
-                osg::Array* texcoords = (geometry->getNumTexCoordArrays()>0) ? geometry->getTexCoordArray(0) : 0;
-                osg::Vec2Array* texcoords_Vec2Array = dynamic_cast<osg::Vec2Array*>(texcoords);
-                if (texcoords_Vec2Array)
-                {
-                    // we have tex coord array so now we can compute the final tex coord at the point of intersection.                                
-                    osg::Vec2 tc1 = (*texcoords_Vec2Array)[i1];
-                    osg::Vec2 tc2 = (*texcoords_Vec2Array)[i2];
-                    osg::Vec2 tc3 = (*texcoords_Vec2Array)[i3];
-                    tc = tc1*r1 + tc2*r2 + tc3*r3;
-                }
-            }
-
-        }
-
-        x = int( float(_client->width) * tc.x() );
-        y = int( float(_client->height) * tc.y() );
-
-        return true;
-    }
-    
-    return false;
-}
-
-
-bool RfbEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa, osg::Object*, osg::NodeVisitor* nv)
-{
-    switch(ea.getEventType())
-    {
-        case(osgGA::GUIEventAdapter::MOVE):
-        case(osgGA::GUIEventAdapter::DRAG):
-        case(osgGA::GUIEventAdapter::PUSH):
-        case(osgGA::GUIEventAdapter::RELEASE):
-        {
-            osgViewer::View* view = dynamic_cast<osgViewer::View*>(&aa);
-            int x,y;
-            if (mousePosition(view, nv, ea, x, y))
-            {
-                SendPointerEvent(_client,x,y, ea.getButtonMask());
-                return true;
-            }
-            break;
-        }
-        case(osgGA::GUIEventAdapter::KEYDOWN):
-        case(osgGA::GUIEventAdapter::KEYUP):
-        {
-            osgViewer::View* view = dynamic_cast<osgViewer::View*>(&aa);
-            int x,y;
-            bool sendKeyEvent = mousePosition(view, nv, ea, x, y);
-        
-            if (sendKeyEvent)
-            {
-                SendKeyEvent(_client,
-                    key2rfbKeySym(ea.getKey()),
-                    (ea.getEventType()==osgGA::GUIEventAdapter::KEYDOWN)?TRUE:FALSE);
-
-                return true;
-            }
-            else
-            {
-                if (ea.getKey()==osgGA::GUIEventAdapter::KEY_Escape)
-                {
-                    osgViewer::Viewer* viewer = dynamic_cast<osgViewer::Viewer*>(&aa);
-                    if (viewer) viewer->setDone(true);
-                }
-            }
-            
-        }
-
-        default:
-            return false;
-    }
-    return false;
-}
-
-int main(int argc,char** argv)
-{
-    osg::ref_ptr<VncImage> image = new VncImage;
-
-    if (image->connect(&argc,argv))
-    {
-        return 1;
-    }
-
-    osg::ArgumentParser arguments(&argc, argv);
-    osgViewer::Viewer viewer;
-
-
-    bool xyPlane = false;
-    bool flip = true;
-    float width = image->s();
-    float height = image->t();
-
-    osg::Geometry* pictureQuad = osg::createTexturedQuadGeometry(osg::Vec3(0.0f,0.0f,0.0f),
-                                       osg::Vec3(width,0.0f,0.0f),
-                                       xyPlane ? osg::Vec3(0.0f,height,0.0f) : osg::Vec3(0.0f,0.0f,height),
+    osg::Geometry* pictureQuad = osg::createTexturedQuadGeometry(origin, widthAxis, heightAxis,
                                        0.0f, flip ? 1.0f : 0.0f , 1.0f, flip ? 0.0f : 1.0f);
 
-    osg::Texture2D* texture = new osg::Texture2D(image.get());
+    osg::Texture2D* texture = new osg::Texture2D(image);
     texture->setResizeNonPowerOfTwoHint(false);
     texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
     texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
@@ -312,15 +30,92 @@ int main(int argc,char** argv)
     pictureQuad->getOrCreateStateSet()->setTextureAttributeAndModes(0,
                 texture,
                 osg::StateAttribute::ON);
+                
+    pictureQuad->setEventCallback(new osgViewer::InteractiveImageHandler(image));
 
     osg::Geode* geode = new osg::Geode;
     geode->addDrawable(pictureQuad);
     
-    viewer.setSceneData(geode);
+    return geode;
+}
+
+class EscapeHandler : public osgGA::GUIEventHandler
+{
+    public:
+    
+        EscapeHandler() {}
+
+        bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa)
+        {
+            if (ea.getHandled()) return false;
+
+            switch(ea.getEventType())
+            {
+                case(osgGA::GUIEventAdapter::KEYUP):
+                {
+                    if (ea.getKey()==osgGA::GUIEventAdapter::KEY_Escape)
+                    {
+                        osgViewer::View* view = dynamic_cast<osgViewer::View*>(&aa);
+                        if (view) view->getViewerBase()->setDone(true);
+                        
+                        return true;
+                    }
+                }
+
+                default:
+                    return false;
+            }
+            return false;
+        }
+};
+
+int main(int argc,char** argv)
+{
+
+    osg::ArgumentParser arguments(&argc, argv);
+    osgViewer::Viewer viewer;
+    
+    typedef std::list< osg::ref_ptr<osg::Image> > Images;
+    Images images;
+
+    std::string hostname;
+    while (arguments.read("--host",hostname))
+    {
+        osg::ref_ptr<osg::Image> image = osgDB::readImageFile(hostname+std::string(".vnc"));
+        if (image.valid()) images.push_back(image.get());
+    }
+    
+    if (images.empty())
+    {
+        return 1;
+    }
+
+    bool xyPlane = false;
+
+    osg::Group* group = new osg::Group;
+
+    osg::Vec3 origin = osg::Vec3(0.0f,0.0f,0.0f);
+    for(Images::iterator itr = images.begin();
+        itr != images.end();
+        ++itr)
+    {
+        osg::Image* image = itr->get();
+        float width = 1.0;
+        float height = float(image->t())/float(image->s());
+        osg::Vec3 widthAxis = osg::Vec3(width,0.0f,0.0f);
+        osg::Vec3 heightAxis = xyPlane ? osg::Vec3(0.0f,height,0.0f) : osg::Vec3(0.0f,0.0f,height);
+        group->addChild(createInteractiveQuad(origin, widthAxis, heightAxis, image));
+        
+        origin += widthAxis*1.1f;
+    }
+    
+    viewer.setSceneData(group);
 
     viewer.addEventHandler(new osgViewer::StatsHandler);
-    viewer.addEventHandler(new RfbEventHandler(image->_client));
     
+    // add a custom escape handler, but disable the standard viewer one to enable the vnc images to handle
+    // the escape without it getting caught by the viewer.
+    viewer.addEventHandler(new EscapeHandler);    
     viewer.setKeyEventSetsDone(0);
 
     return viewer.run();