diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common
index d868b4b082..ff80ea0122 100644
--- a/epan/dissectors/Makefile.common
+++ b/epan/dissectors/Makefile.common
@@ -808,6 +808,7 @@ DISSECTOR_SRC = \
 	packet-umts_fp.c	\
 	packet-uts.c		\
 	packet-v120.c		\
+	packet-vicp.c		\
 	packet-vines.c		\
 	packet-vj.c		\
 	packet-vlan.c		\
diff --git a/epan/dissectors/packet-vicp.c b/epan/dissectors/packet-vicp.c
new file mode 100644
index 0000000000..6fa8c820f4
--- /dev/null
+++ b/epan/dissectors/packet-vicp.c
@@ -0,0 +1,126 @@
+/* packet-vicp.c
+ * LeCroy VICP (GPIB-over-Ethernet-but-lets-not-do-LXI) dissector
+ *
+ * Written by Frank Kingswood <frank.kingswood@artimi.com>
+ * Copyright 2008, Artimi Ltd.
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <epan/packet.h>
+#include <epan/emem.h>
+#include <epan/ptvcursor.h>
+
+/* registration object IDs */
+static int proto_vicp = -1;
+static int hf_vicp_operation = -1;
+static int hf_vicp_version = -1;
+static int hf_vicp_sequence = -1;
+static int hf_vicp_unused = -1;
+static int hf_vicp_length = -1;
+static int hf_vicp_data = -1;
+static gint ett_vicp = -1;
+
+#define VICP_PORT 1861
+
+static void dissect_vicp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+   proto_item *ti;
+   proto_tree *vicp_tree;
+   ptvcursor_t* cursor;
+
+   unsigned len;
+
+   if (tvb_reported_length_remaining(tvb, 0) < 8)
+   {
+      /* Payload too small for VICP */
+      return;
+   }
+
+   if (check_col(pinfo->cinfo, COL_PROTOCOL))
+      col_set_str(pinfo->cinfo, COL_PROTOCOL, "VICP");
+
+   if (check_col(pinfo->cinfo, COL_INFO)) 
+      col_clear(pinfo->cinfo, COL_INFO);
+
+   ti = proto_tree_add_item(tree, proto_vicp, tvb, 0, -1, FALSE);
+   vicp_tree = proto_item_add_subtree(ti, ett_vicp);
+   cursor = ptvcursor_new(vicp_tree, tvb, 0);
+
+   ptvcursor_add(cursor, hf_vicp_operation, 1, FALSE);
+   ptvcursor_add(cursor, hf_vicp_version,   1, FALSE);
+   ptvcursor_add(cursor, hf_vicp_sequence,  1, FALSE);
+   ptvcursor_add(cursor, hf_vicp_unused,    1, FALSE);
+
+   len=tvb_get_ntohl(tvb, ptvcursor_current_offset(cursor));
+   ptvcursor_add(cursor, hf_vicp_length, 4, FALSE);
+
+   if(len==0)
+      proto_tree_add_text(vicp_tree, tvb, 0, 0, "No data");
+   else
+      ptvcursor_add(cursor, hf_vicp_data, len, FALSE);
+
+   ptvcursor_free(cursor);
+}
+
+void proto_register_vicp(void)
+{
+   static hf_register_info hf[] =
+   {
+      {  &hf_vicp_operation,
+         { "Operation","vicp.operation",FT_UINT8,BASE_HEX,NULL,0x0,NULL,HFILL }
+      },
+      {  &hf_vicp_version,
+         { "Protocol version","vicp.version",FT_UINT8,BASE_DEC,NULL,0x0,NULL,HFILL }
+      },
+      {  &hf_vicp_sequence,
+         { "Sequence number","vicp.sequence",FT_UINT8,BASE_DEC,NULL,0x0,NULL,HFILL }
+      },
+      {  &hf_vicp_unused,
+         { "Unused","vicp.unused",FT_UINT8,BASE_HEX,NULL,0x0,NULL,HFILL }
+      },
+      {  &hf_vicp_length,
+         { "Data length","vicp.length",FT_UINT32,BASE_DEC,NULL,0x0,NULL,HFILL }
+      },
+      {  &hf_vicp_data,
+         { "Data","vicp.data",FT_BYTES,BASE_NONE,NULL,0x0,NULL,HFILL }
+      }
+   };
+
+   static gint *ett[] =
+   {  &ett_vicp
+   };
+
+   proto_vicp = proto_register_protocol("LeCroy VICP", "VICP", "vicp");
+   proto_register_field_array(proto_vicp, hf, array_length(hf));
+   proto_register_subtree_array(ett, array_length(ett));
+}
+
+void proto_reg_handoff_vicp(void)
+{  dissector_handle_t vicp_handle;
+
+   vicp_handle = create_dissector_handle(dissect_vicp, proto_vicp);
+   dissector_add("tcp.port", VICP_PORT, vicp_handle);
+}