diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index c857c275172..6628e1320a8 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,24 +1,24 @@
-# $OpenBSD: Makefile,v 1.36 2006/06/13 13:25:31 bernd Exp $
+# $OpenBSD: Makefile,v 1.37 2006/06/13 19:27:54 steven Exp $
 
 COMMENT=	"technical diagrams drawing tool"
 
-DISTNAME=	dia-0.94
-PKGNAME=	${DISTNAME}p5
+DISTNAME=	dia-0.95-1
+PKGNAME=	dia-0.95.1
 CATEGORIES=	graphics
 
 HOMEPAGE=	http://www.gnome.org/projects/dia/
 
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.94/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dia/0.95/}
 
 # GPL
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-WANTLIB=		X11 Xext Xrender atk-1.0.0.0 c z xml2 \
-			fontconfig freetype glib-2.0.0.0 gmodule-2.0.0.0 \
-			gobject-2.0.0.0 m pango-1.0.0.0 pangocairo-1.0.0.0 \
-			pangoft2-1.0.0.0 png cairo glitz
+WANTLIB=	X11 Xext Xrender atk-1.0.0.0 c z xml2 pthread gthread-2.0.0.0 \
+		fontconfig freetype glib-2.0.0.0 gmodule-2.0.0.0 \
+		gobject-2.0.0.0 m pango-1.0.0.0 pangocairo-1.0.0.0 \
+		pangoft2-1.0.0.0 png cairo glitz
 
 BUILD_DEPENDS=	:pkgconfig-*:devel/pkgconfig \
 		:p5-XML-Parser-*:textproc/p5-XML-Parser \
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index b8ee9cf0d11..84ddb418474 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1,4 +1,4 @@
-MD5 (dia-0.94.tar.gz) = d2afdc10f55df29314250d98dbfd7a79
-RMD160 (dia-0.94.tar.gz) = f7e20b294b7b739d5f408c34e0fbc533def5e3b9
-SHA1 (dia-0.94.tar.gz) = a55128bd56e76295c9bc8217f25b6ec079727e25
-SIZE (dia-0.94.tar.gz) = 5241128
+MD5 (dia-0.95-1.tar.gz) = 6224a59fadc6089d5b0dff30b59308c0
+RMD160 (dia-0.95-1.tar.gz) = c903b34fa4f7f2e2ff7e9ec8497608d92c76d7b1
+SHA1 (dia-0.95-1.tar.gz) = eb00a1a2a2b7b3dd966e4375557b770cf75ffb34
+SIZE (dia-0.95-1.tar.gz) = 6035584
diff --git a/graphics/dia/patches/patch-configure b/graphics/dia/patches/patch-configure
index b4db20d7fd2..e69de29bb2d 100644
--- a/graphics/dia/patches/patch-configure
+++ b/graphics/dia/patches/patch-configure
@@ -1,20 +0,0 @@
-$OpenBSD: patch-configure,v 1.9 2005/07/17 07:50:32 alek Exp $
---- configure.orig	Wed Aug 18 17:36:58 2004
-+++ configure	Wed Jul 13 00:02:04 2005
-@@ -7998,7 +7998,7 @@ nto-qnx*)
- openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
--  need_version=yes
-+  need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -25102,6 +25102,7 @@ fi
- 
- db2man_file=
- for file in \
-+  ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl \
-   /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl \
-   /usr/share/sgml/docbook/xsl-stylesheets-\*/manpages/docbook.xsl; do
-   if test -f $file; then db2man_file=$file; break; fi
diff --git a/graphics/dia/patches/patch-doc_en_Makefile_in b/graphics/dia/patches/patch-doc_en_Makefile_in
index 4375f8589ea..f902aa6ace3 100644
--- a/graphics/dia/patches/patch-doc_en_Makefile_in
+++ b/graphics/dia/patches/patch-doc_en_Makefile_in
@@ -1,25 +1,33 @@
-$OpenBSD: patch-doc_en_Makefile_in,v 1.1 2005/05/17 20:14:44 alek Exp $
---- doc/en/Makefile.in.orig	Thu Aug 19 16:25:57 2004
-+++ doc/en/Makefile.in	Sun May  1 00:18:49 2005
-@@ -582,7 +582,7 @@ install-data-hook-omf:
- 	for file in $(omffile); do \
- 		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
- 	done
+$OpenBSD: patch-doc_en_Makefile_in,v 1.2 2006/06/13 19:27:54 steven Exp $
+--- doc/en/Makefile.in.orig	Thu May 25 22:49:19 2006
++++ doc/en/Makefile.in	Thu Jun  8 12:19:11 2006
+@@ -332,6 +332,7 @@ entities = 
+ # This variable (docdir) specifies where the documents should be installed.
+ # This default value should work for most packages.
+ @HAVE_GNOME_TRUE@docdir = $(datadir)/gnome/help/$(docname)/$(lang)
++docdir = $(datadir)/gnome/help/$(docname)/$(lang)
+ 
+ # **********  You should not have to edit below this line  **********
+ xml_files = $(entities) $(docname).xml authors.xml dia.xml \
+@@ -594,7 +595,7 @@ install-data-hook-omf:
+ 	    $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
+ 	  done; \
+ 	fi
 -	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
 +	# -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
  
  uninstall-local-omf:
  	-for file in $(srcdir)/*.omf; do \
-@@ -597,7 +597,7 @@ clean-local-omf:
- 		rm -f $$file.out; \
- 	done
+@@ -611,7 +612,7 @@ clean-local-omf:
+ 	  done; \
+ 	fi
  
 -all: omf
 +all:
  
  $(docname).xml: $(entities)
  	-ourdir=`pwd`;  \
-@@ -613,7 +613,7 @@ app-dist-hook:
+@@ -627,7 +628,7 @@ app-dist-hook:
  	  done \
  	fi
  
diff --git a/graphics/dia/patches/patch-doc_eu_Makefile_in b/graphics/dia/patches/patch-doc_eu_Makefile_in
new file mode 100644
index 00000000000..fc09b403e57
--- /dev/null
+++ b/graphics/dia/patches/patch-doc_eu_Makefile_in
@@ -0,0 +1,29 @@
+$OpenBSD: patch-doc_eu_Makefile_in,v 1.1 2006/06/13 19:27:54 steven Exp $
+--- doc/eu/Makefile.in.orig	Thu May 25 22:49:19 2006
++++ doc/eu/Makefile.in	Thu Jun  8 12:19:25 2006
+@@ -332,6 +332,7 @@ entities = 
+ # This variable (docdir) specifies where the documents should be installed.
+ # This default value should work for most packages.
+ @HAVE_GNOME_TRUE@docdir = $(datadir)/gnome/help/$(docname)/$(lang)
++docdir = $(datadir)/gnome/help/$(docname)/$(lang)
+ 
+ # **********  You should not have to edit below this line  **********
+ xml_files = $(entities) $(docname).xml
+@@ -587,7 +588,7 @@ install-data-hook-omf:
+ 	    $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
+ 	  done; \
+ 	fi
+-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
++	# -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+ 
+ uninstall-local-omf:
+ 	-for file in $(srcdir)/*.omf; do \
+@@ -604,7 +605,7 @@ clean-local-omf:
+ 	  done; \
+ 	fi
+ 
+-all: omf
++all:
+ 
+ $(docname).xml: $(entities)
+ 	-ourdir=`pwd`;  \
diff --git a/graphics/dia/patches/patch-doc_pl_Makefile_in b/graphics/dia/patches/patch-doc_pl_Makefile_in
index 1b450c96a82..bcb4450eb16 100644
--- a/graphics/dia/patches/patch-doc_pl_Makefile_in
+++ b/graphics/dia/patches/patch-doc_pl_Makefile_in
@@ -1,25 +1,33 @@
-$OpenBSD: patch-doc_pl_Makefile_in,v 1.1 2005/05/17 20:14:44 alek Exp $
---- doc/pl/Makefile.in.orig	Thu Aug 19 16:26:00 2004
-+++ doc/pl/Makefile.in	Sun May  1 01:01:49 2005
-@@ -522,7 +522,7 @@ install-data-hook-omf:
- 	for file in $(omffile); do \
- 		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
- 	done
+$OpenBSD: patch-doc_pl_Makefile_in,v 1.2 2006/06/13 19:27:54 steven Exp $
+--- doc/pl/Makefile.in.orig	Thu May 25 22:49:20 2006
++++ doc/pl/Makefile.in	Thu Jun  8 12:19:41 2006
+@@ -328,6 +328,7 @@ entities = 
+ # This variable (docdir) specifies where the documents should be installed.
+ # This default value should work for most packages.
+ @HAVE_GNOME_TRUE@docdir = $(datadir)/gnome/help/$(docname)/$(lang)
++docdir = $(datadir)/gnome/help/$(docname)/$(lang)
+ 
+ # **********  You should not have to edit below this line  **********
+ xml_files = $(entities) $(docname).xml
+@@ -529,7 +530,7 @@ install-data-hook-omf:
+ 	    $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
+ 	  done; \
+ 	fi
 -	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
 +	# -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
  
  uninstall-local-omf:
  	-for file in $(srcdir)/*.omf; do \
-@@ -537,7 +537,7 @@ clean-local-omf:
- 		rm -f $$file.out; \
- 	done
+@@ -546,7 +547,7 @@ clean-local-omf:
+ 	  done; \
+ 	fi
  
 -all: omf
 +all:
  
  $(docname).xml: $(entities)
  	-ourdir=`pwd`;  \
-@@ -553,7 +553,7 @@ app-dist-hook:
+@@ -562,7 +563,7 @@ app-dist-hook:
  	  done \
  	fi
  
diff --git a/graphics/dia/patches/patch-plug-ins_xfig_xfig-import_c b/graphics/dia/patches/patch-plug-ins_xfig_xfig-import_c
deleted file mode 100644
index d9d7bf49190..00000000000
--- a/graphics/dia/patches/patch-plug-ins_xfig_xfig-import_c
+++ /dev/null
@@ -1,193 +0,0 @@
-$OpenBSD: patch-plug-ins_xfig_xfig-import_c,v 1.1 2006/04/03 16:21:47 steven Exp $
---- plug-ins/xfig/xfig-import.c.orig	Mon Aug 16 09:56:21 2004
-+++ plug-ins/xfig/xfig-import.c	Mon Apr  3 18:16:09 2006
-@@ -441,11 +441,17 @@ create_standard_group(GList *items, Diag
- static Color
- fig_color(int color_index) 
- {
--    if (color_index == -1) 
-+    if (color_index <= -1) 
-         return color_black; /* Default color */
--    if (color_index < FIG_MAX_DEFAULT_COLORS) 
-+    else if (color_index < FIG_MAX_DEFAULT_COLORS) 
-         return fig_default_colors[color_index];
--    else return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS];
-+    else if (color_index < FIG_MAX_USER_COLORS) 
-+	return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS];
-+    else {
-+	message_error(_("Color index %d too high, only 512 colors allowed. Using black instead."),
-+		      color_index);
-+	return color_black;
-+    }
- }
- 
- static Color
-@@ -563,23 +569,25 @@ fig_simple_properties(DiaObject *obj,
- static int
- fig_read_n_points(FILE *file, int n, Point **points) {
-     int i;
--    Point *new_points;
-+    GArray *points_list = g_array_sized_new(FALSE, FALSE, sizeof(Point), n);
- 
--    new_points = (Point*)g_malloc(sizeof(Point)*n);
--
-     for (i = 0; i < n; i++) {
- 	int x,y;
-+	Point p;
- 	if (fscanf(file, " %d %d ", &x, &y) != 2) {
- 	    message_error(_("Error while reading %dth of %d points: %s\n"),
- 			  i, n, strerror(errno));
--	    free(new_points);
-+	    g_array_free(points_list, TRUE);
- 	    return FALSE;
- 	}
--	new_points[i].x = x/FIG_UNIT;
--	new_points[i].y = y/FIG_UNIT;
-+	p.x = x/FIG_UNIT;
-+	p.y = y/FIG_UNIT;
-+	g_array_append_val(points_list, p);
-     }
-     fscanf(file, "\n");
--    *points = new_points;
-+    
-+    *points = (Point *)points_list->data;
-+    g_array_free(points_list, FALSE);
-     return TRUE;
- }
- 
-@@ -683,7 +691,7 @@ fig_read_text_line(FILE *file) {
-     return text_buf;
- }
- 
--static GList *depths[1000];
-+static GList *depths[FIG_MAX_DEPTHS];
- 
- /* If there's something in the compound stack, we ignore the depth field,
-    as it will be determined by the group anyway */
-@@ -693,6 +701,26 @@ static GSList *compound_stack = NULL;
-    level.  Best we can do now. */
- static int compound_depth;
- 
-+/** Add an object at a given depth.  This function checks for depth limits
-+ * and updates the compound depth if needed.
-+ *
-+ * @param newobj An object to add.  If we're inside a compound, this
-+ * doesn't really add the object.
-+ * @param depth A depth as in the Fig format, max 999
-+ */
-+static void
-+add_at_depth(DiaObject *newobj, int depth) {
-+    if (depth < 0 || depth >= FIG_MAX_DEPTHS) {
-+	message_error(_("Depth %d of of range, only 0-%d allowed.\n"),
-+		      depth, FIG_MAX_DEPTHS-1);
-+	depth = FIG_MAX_DEPTHS - 1;
-+    }
-+    if (compound_stack == NULL) 
-+	depths[depth] = g_list_append(depths[depth], newobj);
-+    else 
-+	if (compound_depth > depth) compound_depth = depth;
-+}
-+
- static DiaObject *
- fig_read_ellipse(FILE *file, DiagramData *dia) {
-     int sub_type;
-@@ -749,10 +777,7 @@ fig_read_ellipse(FILE *file, DiagramData
-     /* Angle -- can't rotate yet */
- 
-     /* Depth field */
--    if (compound_stack == NULL)
--	depths[depth] = g_list_append(depths[depth], newobj);
--    else
--	if (compound_depth > depth) compound_depth = depth;
-+    add_at_depth(newobj, depth);
- 
-     return newobj;
- }
-@@ -885,10 +910,7 @@ fig_read_polyline(FILE *file, DiagramDat
-     /* Cap style */
-      
-     /* Depth field */
--    if (compound_stack == NULL)
--	depths[depth] = g_list_append(depths[depth], newobj);
--    else
--	if (compound_depth > depth) compound_depth = depth;
-+    add_at_depth(newobj, depth);
-  exit:
-     prop_list_free(props);
-     g_free(forward_arrow_info);
-@@ -1111,10 +1133,7 @@ fig_read_spline(FILE *file, DiagramData 
-     /* Cap style */
-      
-     /* Depth field */
--    if (compound_stack == NULL)
--	depths[depth] = g_list_append(depths[depth], newobj);
--    else
--	if (compound_depth > depth) compound_depth = depth;
-+    add_at_depth(newobj, depth);
-  exit:
-     prop_list_free(props);
-     g_free(forward_arrow_info);
-@@ -1202,10 +1221,7 @@ fig_read_arc(FILE *file, DiagramData *di
-     /* Cap style */
-      
-     /* Depth field */
--    if (compound_stack == NULL)
--	depths[depth] = g_list_append(depths[depth], newobj);
--    else
--	if (compound_depth > depth) compound_depth = depth;
-+    add_at_depth(newobj, depth);
- 
-  exit:
-     g_free(forward_arrow_info);
-@@ -1298,10 +1314,7 @@ fig_read_text(FILE *file, DiagramData *d
-     newobj->ops->set_props(newobj, props);
-     
-     /* Depth field */
--    if (compound_stack == NULL)
--	depths[depth] = g_list_append(depths[depth], newobj);
--    else
--	if (compound_depth > depth) compound_depth = depth;
-+    add_at_depth(newobj, depth);
- 
-  exit:
-     if (text_buf != NULL) free(text_buf);
-@@ -1347,6 +1360,12 @@ fig_read_object(FILE *file, DiagramData 
- 	    return FALSE;
- 	}
- 
-+	if (colornumber < 32 || colornumber > FIG_MAX_USER_COLORS) {
-+	    message_error(_("Color number %d out of range 0..%d.  Discarding color.\n"),
-+			  colornumber, FIG_MAX_USER_COLORS);
-+	    return FALSE;
-+	}
-+
- 	color.red = ((colorvalues & 0x00ff0000)>>16) / 255.0;
- 	color.green = ((colorvalues & 0x0000ff00)>>8) / 255.0;
- 	color.blue = (colorvalues & 0x000000ff) / 255.0;
-@@ -1393,7 +1412,7 @@ fig_read_object(FILE *file, DiagramData 
- 	}
- 	/* Group extends don't really matter */
- 	if (compound_stack == NULL)
--	    compound_depth = 999;
-+	    compound_depth = FIG_MAX_DEPTHS - 1;
- 	compound_stack = g_slist_append(compound_stack, NULL);
- 	return TRUE;
- 	break;
-@@ -1551,7 +1570,7 @@ import_fig(const gchar *filename, Diagra
-     for (i = 0; i < FIG_MAX_USER_COLORS; i++) {
- 	fig_colors[i] = color_black;
-     }
--    for (i = 0; i < 1000; i++) {
-+    for (i = 0; i < FIG_MAX_DEPTHS; i++) {
- 	depths[i] = NULL;
-     }
- 
-@@ -1606,7 +1625,7 @@ import_fig(const gchar *filename, Diagra
-     } while (TRUE);
- 
-     /* Now we can reorder for the depth fields */
--    for (i = 0; i < 1000; i++) {
-+    for (i = 0; i < FIG_MAX_DEPTHS; i++) {
- 	if (depths[i] != NULL)
- 	    layer_add_objects_first(dia->active_layer, depths[i]);
-     }
diff --git a/graphics/dia/patches/patch-plug-ins_xfig_xfig_h b/graphics/dia/patches/patch-plug-ins_xfig_xfig_h
deleted file mode 100644
index 0b13491bbea..00000000000
--- a/graphics/dia/patches/patch-plug-ins_xfig_xfig_h
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-plug-ins_xfig_xfig_h,v 1.1 2006/04/03 16:21:47 steven Exp $
---- plug-ins/xfig/xfig.h.orig	Mon Aug 16 09:56:21 2004
-+++ plug-ins/xfig/xfig.h	Mon Apr  3 18:16:09 2006
-@@ -6,6 +6,7 @@ extern char *fig_fonts[];
- 
- #define FIG_MAX_DEFAULT_COLORS 32
- #define FIG_MAX_USER_COLORS 512
-+#define FIG_MAX_DEPTHS 1000
- /* 1200 PPI */
- #define FIG_UNIT 472.440944881889763779527559055118
- /* 1/80 inch */
diff --git a/graphics/dia/patches/patch-xmldocs_make b/graphics/dia/patches/patch-xmldocs_make
new file mode 100644
index 00000000000..f279dd52b14
--- /dev/null
+++ b/graphics/dia/patches/patch-xmldocs_make
@@ -0,0 +1,19 @@
+$OpenBSD: patch-xmldocs_make,v 1.1 2006/06/13 19:27:54 steven Exp $
+--- xmldocs.make.orig	Thu Jun  8 12:36:49 2006
++++ xmldocs.make	Thu Jun  8 12:37:02 2006
+@@ -36,11 +36,11 @@
+ # **********  Begin of section some packagers may need to modify  **********
+ # This variable (docdir) specifies where the documents should be installed.
+ # This default value should work for most packages.
+-if HAVE_GNOME
++#if HAVE_GNOME
+ docdir = $(datadir)/gnome/help/$(docname)/$(lang)
+-else
+-docdir = $(datadir)/help/$(docname)/$(lang)
+-endif
++#else
++#docdir = $(datadir)/help/$(docname)/$(lang)
++#endif
+ 
+ # **********  You should not have to edit below this line  **********
+ xml_files = $(entities) $(docname).xml
diff --git a/graphics/dia/pkg/PFRAG.shared b/graphics/dia/pkg/PFRAG.shared
index 87de9c7fdc9..d191ceb0d4c 100644
--- a/graphics/dia/pkg/PFRAG.shared
+++ b/graphics/dia/pkg/PFRAG.shared
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PFRAG.shared,v 1.5 2004/12/22 06:01:23 marcm Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.6 2006/06/13 19:27:54 steven Exp $
+lib/dia/libaadl_objects.so
 lib/dia/libbondgraph_objects.so
 lib/dia/libcairo_filter.so
 lib/dia/libcgm_filter.so
@@ -17,6 +18,7 @@ lib/dia/libkaos_objects.so
 lib/dia/libmetapost_filter.so
 lib/dia/libmisc_objects.so
 lib/dia/libnetwork_objects.so
+lib/dia/libpgf_filter.so
 lib/dia/libpixbuf_filter.so
 lib/dia/libpstricks_filter.so
 lib/dia/libsadt_objects.so
diff --git a/graphics/dia/pkg/PLIST b/graphics/dia/pkg/PLIST
index 178d23dc9c8..6708f010afc 100644
--- a/graphics/dia/pkg/PLIST
+++ b/graphics/dia/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.9 2006/01/20 07:15:22 steven Exp $
+@comment $OpenBSD: PLIST,v 1.10 2006/06/13 19:27:54 steven Exp $
 bin/dia
 lib/dia/
+lib/dia/libaadl_objects.la
 lib/dia/libbondgraph_objects.la
 lib/dia/libcairo_filter.la
 lib/dia/libcgm_filter.la
@@ -19,6 +20,7 @@ lib/dia/libkaos_objects.la
 lib/dia/libmetapost_filter.la
 lib/dia/libmisc_objects.la
 lib/dia/libnetwork_objects.la
+lib/dia/libpgf_filter.la
 lib/dia/libpixbuf_filter.la
 lib/dia/libpstricks_filter.la
 lib/dia/libsadt_objects.la
@@ -26,8 +28,6 @@ lib/dia/libshape_filter.la
 lib/dia/libstandard_objects.la
 lib/dia/libsvg_filter.la
 lib/dia/libuml_objects.la
-lib/dia/libwmf_filter.a
-lib/dia/libwmf_filter.la
 lib/dia/libwpg_filter.la
 lib/dia/libxfig_filter.la
 lib/dia/libxslt_filter.la
@@ -36,17 +36,6 @@ share/applications/
 share/applications/dia.desktop
 share/dia/
 share/dia/dia_logo.png
-share/dia/images/
-share/dia/images/broken-chain.xpm
-share/dia/images/connectable-empty.png
-share/dia/images/connectable.png
-share/dia/images/off-grid.png
-share/dia/images/on-grid.png
-share/dia/images/selectable-empty.png
-share/dia/images/selectable.png
-share/dia/images/unbroken-chain.xpm
-share/dia/images/visible-empty.png
-share/dia/images/visible.png
 share/dia/shapes/
 share/dia/shapes/Assorted/
 share/dia/shapes/Assorted/arrow-chevron.png
@@ -306,6 +295,8 @@ share/dia/shapes/Cisco/10700.png
 share/dia/shapes/Cisco/10700.shape
 share/dia/shapes/Cisco/15200.png
 share/dia/shapes/Cisco/15200.shape
+share/dia/shapes/Cisco/15800.png
+share/dia/shapes/Cisco/15800.shape
 share/dia/shapes/Cisco/3174.png
 share/dia/shapes/Cisco/3174.shape
 share/dia/shapes/Cisco/3x74.png
@@ -328,10 +319,18 @@ share/dia/shapes/Cisco/7505.png
 share/dia/shapes/Cisco/7505.shape
 share/dia/shapes/Cisco/7507.png
 share/dia/shapes/Cisco/7507.shape
+share/dia/shapes/Cisco/access_gateway.png
+share/dia/shapes/Cisco/access_gateway.shape
+share/dia/shapes/Cisco/access_server.png
+share/dia/shapes/Cisco/access_server.shape
 share/dia/shapes/Cisco/accesspoint.png
 share/dia/shapes/Cisco/accesspoint.shape
 share/dia/shapes/Cisco/adm.png
 share/dia/shapes/Cisco/adm.shape
+share/dia/shapes/Cisco/androgynous_person.png
+share/dia/shapes/Cisco/androgynous_person.shape
+share/dia/shapes/Cisco/antenna.png
+share/dia/shapes/Cisco/antenna.shape
 share/dia/shapes/Cisco/asic.png
 share/dia/shapes/Cisco/asic.shape
 share/dia/shapes/Cisco/ata.png
@@ -340,22 +339,27 @@ share/dia/shapes/Cisco/atm3800.png
 share/dia/shapes/Cisco/atm3800.shape
 share/dia/shapes/Cisco/atm_fast_gigabit_etherswitch.png
 share/dia/shapes/Cisco/atm_fast_gigabit_etherswitch.shape
-share/dia/shapes/Cisco/atm_router.png
 share/dia/shapes/Cisco/atm_router.shape
 share/dia/shapes/Cisco/atm_switch.png
 share/dia/shapes/Cisco/atm_switch.shape
-share/dia/shapes/Cisco/atm_tag_sw_gigabit_router.png
-share/dia/shapes/Cisco/atm_tag_sw_gigabit_router.shape
 share/dia/shapes/Cisco/atm_tag_switch_router.png
 share/dia/shapes/Cisco/atm_tag_switch_router.shape
+share/dia/shapes/Cisco/automatic_protection_switching.png
+share/dia/shapes/Cisco/automatic_protection_switching.shape
 share/dia/shapes/Cisco/bbfw.png
 share/dia/shapes/Cisco/bbfw.shape
 share/dia/shapes/Cisco/bbfw_media.png
 share/dia/shapes/Cisco/bbfw_media.shape
+share/dia/shapes/Cisco/bbs.png
+share/dia/shapes/Cisco/bbs.shape
 share/dia/shapes/Cisco/bbsm.png
 share/dia/shapes/Cisco/bbsm.shape
 share/dia/shapes/Cisco/branch_office.png
 share/dia/shapes/Cisco/branch_office.shape
+share/dia/shapes/Cisco/branch_office_blue.png
+share/dia/shapes/Cisco/branch_office_blue.shape
+share/dia/shapes/Cisco/branch_office_subdued.png
+share/dia/shapes/Cisco/branch_office_subdued.shape
 share/dia/shapes/Cisco/breakout_box.png
 share/dia/shapes/Cisco/breakout_box.shape
 share/dia/shapes/Cisco/bridge.png
@@ -372,44 +376,74 @@ share/dia/shapes/Cisco/callmanager.png
 share/dia/shapes/Cisco/callmanager.shape
 share/dia/shapes/Cisco/car.png
 share/dia/shapes/Cisco/car.shape
+share/dia/shapes/Cisco/carrier_routing_system.png
+share/dia/shapes/Cisco/carrier_routing_system.shape
 share/dia/shapes/Cisco/catalyst_access_gateway.png
 share/dia/shapes/Cisco/catalyst_access_gateway.shape
-share/dia/shapes/Cisco/cddi_fddi.png
-share/dia/shapes/Cisco/cddi_fddi.shape
+share/dia/shapes/Cisco/cddi_fddi_concentrator.png
+share/dia/shapes/Cisco/cddi_fddi_concentrator.shape
 share/dia/shapes/Cisco/cdm.png
 share/dia/shapes/Cisco/cdm.shape
 share/dia/shapes/Cisco/cellular_phone.png
 share/dia/shapes/Cisco/cellular_phone.shape
-share/dia/shapes/Cisco/centri.png
-share/dia/shapes/Cisco/centri.shape
+share/dia/shapes/Cisco/centri_firewall.png
+share/dia/shapes/Cisco/centri_firewall.shape
+share/dia/shapes/Cisco/channelized_pipe.png
+share/dia/shapes/Cisco/channelized_pipe.shape
 share/dia/shapes/Cisco/cisco_hub.png
 share/dia/shapes/Cisco/cisco_hub.shape
 share/dia/shapes/Cisco/ciscosecurity.png
 share/dia/shapes/Cisco/ciscosecurity.shape
 share/dia/shapes/Cisco/ciscoworks.png
 share/dia/shapes/Cisco/ciscoworks.shape
+share/dia/shapes/Cisco/ciscoworks_man.png
+share/dia/shapes/Cisco/ciscoworks_man.shape
 share/dia/shapes/Cisco/class45_switch.png
 share/dia/shapes/Cisco/class45_switch.shape
 share/dia/shapes/Cisco/cloud.png
 share/dia/shapes/Cisco/cloud.shape
+share/dia/shapes/Cisco/cloud_dark.png
+share/dia/shapes/Cisco/cloud_dark.shape
+share/dia/shapes/Cisco/cloud_gold.png
+share/dia/shapes/Cisco/cloud_gold.shape
+share/dia/shapes/Cisco/cloud_white.png
+share/dia/shapes/Cisco/cloud_white.shape
 share/dia/shapes/Cisco/communications_server.png
 share/dia/shapes/Cisco/communications_server.shape
+share/dia/shapes/Cisco/concatenated_payload.png
+share/dia/shapes/Cisco/concatenated_payload.shape
 share/dia/shapes/Cisco/content_engine.png
 share/dia/shapes/Cisco/content_engine.shape
-share/dia/shapes/Cisco/content_service_router.png
-share/dia/shapes/Cisco/content_service_router.shape
+share/dia/shapes/Cisco/content_router.png
+share/dia/shapes/Cisco/content_router.shape
+share/dia/shapes/Cisco/content_service_module.png
+share/dia/shapes/Cisco/content_service_module.shape
 share/dia/shapes/Cisco/content_switch.png
 share/dia/shapes/Cisco/content_switch.shape
-share/dia/shapes/Cisco/content_switch_module.png
-share/dia/shapes/Cisco/content_switch_module.shape
+share/dia/shapes/Cisco/csm-s.png
+share/dia/shapes/Cisco/csm-s.shape
 share/dia/shapes/Cisco/css1100.png
 share/dia/shapes/Cisco/css1100.shape
 share/dia/shapes/Cisco/csu_dsu.png
 share/dia/shapes/Cisco/csu_dsu.shape
 share/dia/shapes/Cisco/cte.png
 share/dia/shapes/Cisco/cte.shape
+share/dia/shapes/Cisco/data_center_switch.png
+share/dia/shapes/Cisco/data_center_switch.shape
+share/dia/shapes/Cisco/data_center_switch_reversed.png
+share/dia/shapes/Cisco/data_center_switch_reversed.shape
+share/dia/shapes/Cisco/data_switch_processor.png
+share/dia/shapes/Cisco/data_switch_processor.shape
+share/dia/shapes/Cisco/detector.png
+share/dia/shapes/Cisco/detector.shape
+share/dia/shapes/Cisco/digital_cross-connect.png
+share/dia/shapes/Cisco/digital_cross-connect.shape
+share/dia/shapes/Cisco/director_fcis.png
+share/dia/shapes/Cisco/director_fcis.shape
 share/dia/shapes/Cisco/directory_server.png
 share/dia/shapes/Cisco/directory_server.shape
+share/dia/shapes/Cisco/disk_subsystem.png
+share/dia/shapes/Cisco/disk_subsystem.shape
 share/dia/shapes/Cisco/diskette.png
 share/dia/shapes/Cisco/diskette.shape
 share/dia/shapes/Cisco/distributed_director.png
@@ -420,10 +454,17 @@ share/dia/shapes/Cisco/dpt.png
 share/dia/shapes/Cisco/dpt.shape
 share/dia/shapes/Cisco/dslam.png
 share/dia/shapes/Cisco/dslam.shape
+share/dia/shapes/Cisco/dual_mode_accesspoint.png
+share/dia/shapes/Cisco/dual_mode_accesspoint.shape
 share/dia/shapes/Cisco/dwdm_filter.png
 share/dia/shapes/Cisco/dwdm_filter.shape
+share/dia/shapes/Cisco/edge_label_switch_router.png
+share/dia/shapes/Cisco/edge_label_switch_router_with_netflow.png
+share/dia/shapes/Cisco/edge_label_switch_router_with_netflow.shape
 share/dia/shapes/Cisco/end_office.png
 share/dia/shapes/Cisco/end_office.shape
+share/dia/shapes/Cisco/etherclient.png
+share/dia/shapes/Cisco/etherclient.shape
 share/dia/shapes/Cisco/fax.png
 share/dia/shapes/Cisco/fax.shape
 share/dia/shapes/Cisco/fc_storage.png
@@ -432,16 +473,28 @@ share/dia/shapes/Cisco/fddi_ring.png
 share/dia/shapes/Cisco/fddi_ring.shape
 share/dia/shapes/Cisco/file_cabinet.png
 share/dia/shapes/Cisco/file_cabinet.shape
+share/dia/shapes/Cisco/file_engine.png
+share/dia/shapes/Cisco/file_engine.shape
 share/dia/shapes/Cisco/file_server.png
 share/dia/shapes/Cisco/file_server.shape
 share/dia/shapes/Cisco/firewall.png
 share/dia/shapes/Cisco/firewall.shape
+share/dia/shapes/Cisco/firewall_horizontal.png
+share/dia/shapes/Cisco/firewall_horizontal.shape
+share/dia/shapes/Cisco/firewall_subdued.png
+share/dia/shapes/Cisco/firewall_subdued.shape
 share/dia/shapes/Cisco/front_end_processor.png
 share/dia/shapes/Cisco/front_end_processor.shape
+share/dia/shapes/Cisco/fwsm.png
+share/dia/shapes/Cisco/fwsm.shape
 share/dia/shapes/Cisco/general_appliance.png
 share/dia/shapes/Cisco/general_appliance.shape
 share/dia/shapes/Cisco/generic_building.png
 share/dia/shapes/Cisco/generic_building.shape
+share/dia/shapes/Cisco/generic_building_blue.png
+share/dia/shapes/Cisco/generic_building_blue.shape
+share/dia/shapes/Cisco/generic_building_subdued.png
+share/dia/shapes/Cisco/generic_building_subdued.shape
 share/dia/shapes/Cisco/generic_gateway.png
 share/dia/shapes/Cisco/generic_gateway.shape
 share/dia/shapes/Cisco/generic_processor.png
@@ -452,22 +505,36 @@ share/dia/shapes/Cisco/gigabit_switch_router_atm_tag.png
 share/dia/shapes/Cisco/gigabit_switch_router_atm_tag.shape
 share/dia/shapes/Cisco/government_building.png
 share/dia/shapes/Cisco/government_building.shape
+share/dia/shapes/Cisco/guard.png
+share/dia/shapes/Cisco/guard.shape
 share/dia/shapes/Cisco/h323.png
 share/dia/shapes/Cisco/h323.shape
 share/dia/shapes/Cisco/handheld.png
 share/dia/shapes/Cisco/handheld.shape
+share/dia/shapes/Cisco/headphones.png
+share/dia/shapes/Cisco/headphones.shape
+share/dia/shapes/Cisco/home_office.png
+share/dia/shapes/Cisco/home_office.shape
 share/dia/shapes/Cisco/hootphone.png
 share/dia/shapes/Cisco/hootphone.shape
 share/dia/shapes/Cisco/host.png
 share/dia/shapes/Cisco/host.shape
+share/dia/shapes/Cisco/house.png
+share/dia/shapes/Cisco/house.shape
+share/dia/shapes/Cisco/house_blue.png
+share/dia/shapes/Cisco/house_blue.shape
 share/dia/shapes/Cisco/hp_mini.png
 share/dia/shapes/Cisco/hp_mini.shape
 share/dia/shapes/Cisco/hub.png
 share/dia/shapes/Cisco/hub.shape
+share/dia/shapes/Cisco/hub_subdued.png
+share/dia/shapes/Cisco/hub_subdued.shape
 share/dia/shapes/Cisco/iad_router.png
 share/dia/shapes/Cisco/iad_router.shape
 share/dia/shapes/Cisco/ibm_mainframe.png
 share/dia/shapes/Cisco/ibm_mainframe.shape
+share/dia/shapes/Cisco/ibm_mainframe_with_fep.png
+share/dia/shapes/Cisco/ibm_mainframe_with_fep.shape
 share/dia/shapes/Cisco/ibm_mini.png
 share/dia/shapes/Cisco/ibm_mini.shape
 share/dia/shapes/Cisco/ibm_tower.png
@@ -476,56 +543,96 @@ share/dia/shapes/Cisco/icm.png
 share/dia/shapes/Cisco/icm.shape
 share/dia/shapes/Cisco/ics.png
 share/dia/shapes/Cisco/ics.shape
+share/dia/shapes/Cisco/intelliswitch_stack.png
+share/dia/shapes/Cisco/intelliswitch_stack.shape
 share/dia/shapes/Cisco/ios_firewall.png
 share/dia/shapes/Cisco/ios_firewall.shape
+share/dia/shapes/Cisco/ios_slb.png
+share/dia/shapes/Cisco/ios_slb.shape
 share/dia/shapes/Cisco/ip.png
 share/dia/shapes/Cisco/ip.shape
 share/dia/shapes/Cisco/ip_dsl.png
 share/dia/shapes/Cisco/ip_dsl.shape
+share/dia/shapes/Cisco/ip_old-style.png
+share/dia/shapes/Cisco/ip_old-style.shape
 share/dia/shapes/Cisco/ip_phone.png
 share/dia/shapes/Cisco/ip_phone.shape
 share/dia/shapes/Cisco/ip_softphone.png
 share/dia/shapes/Cisco/ip_softphone.shape
 share/dia/shapes/Cisco/ip_telephony_router.png
 share/dia/shapes/Cisco/ip_telephony_router.shape
-share/dia/shapes/Cisco/iptc.png
-share/dia/shapes/Cisco/iptc.shape
+share/dia/shapes/Cisco/ip_transport_concentrator.png
+share/dia/shapes/Cisco/ip_transport_concentrator.shape
 share/dia/shapes/Cisco/iptv_broadcast_server.png
 share/dia/shapes/Cisco/iptv_broadcast_server.shape
 share/dia/shapes/Cisco/iptv_content_manager.png
 share/dia/shapes/Cisco/iptv_content_manager.shape
+share/dia/shapes/Cisco/iscsi_switch.png
+share/dia/shapes/Cisco/iscsi_switch.shape
 share/dia/shapes/Cisco/isdn_switch.png
 share/dia/shapes/Cisco/isdn_switch.shape
 share/dia/shapes/Cisco/itp.png
 share/dia/shapes/Cisco/itp.shape
+share/dia/shapes/Cisco/jbod.png
+share/dia/shapes/Cisco/jbod.shape
 share/dia/shapes/Cisco/key.png
 share/dia/shapes/Cisco/key.shape
+share/dia/shapes/Cisco/label_switch_router.png
+share/dia/shapes/Cisco/label_switch_router.shape
+share/dia/shapes/Cisco/lan2lan_switch.png
+share/dia/shapes/Cisco/lan2lan_switch.shape
 share/dia/shapes/Cisco/lan_to_lan.png
 share/dia/shapes/Cisco/lan_to_lan.shape
 share/dia/shapes/Cisco/laptop.png
 share/dia/shapes/Cisco/laptop.shape
 share/dia/shapes/Cisco/layer3_switch.png
 share/dia/shapes/Cisco/layer3_switch.shape
+share/dia/shapes/Cisco/layer_2_remote_switch.png
+share/dia/shapes/Cisco/layer_2_remote_switch.shape
+share/dia/shapes/Cisco/lightweight_ap.png
+share/dia/shapes/Cisco/lightweight_ap.shape
 share/dia/shapes/Cisco/localdirector.png
 share/dia/shapes/Cisco/localdirector.shape
+share/dia/shapes/Cisco/location_server.png
+share/dia/shapes/Cisco/location_server.shape
 share/dia/shapes/Cisco/lock.png
 share/dia/shapes/Cisco/lock.shape
+share/dia/shapes/Cisco/lock_and_key.png
+share/dia/shapes/Cisco/lock_and_key.shape
 share/dia/shapes/Cisco/longreach_cpe.png
 share/dia/shapes/Cisco/longreach_cpe.shape
 share/dia/shapes/Cisco/mac_woman.png
 share/dia/shapes/Cisco/mac_woman.shape
+share/dia/shapes/Cisco/mac_woman_right.png
+share/dia/shapes/Cisco/mac_woman_right.shape
 share/dia/shapes/Cisco/macintosh.png
 share/dia/shapes/Cisco/macintosh.shape
+share/dia/shapes/Cisco/man.png
+share/dia/shapes/Cisco/man.shape
+share/dia/shapes/Cisco/man_blue.png
+share/dia/shapes/Cisco/man_blue.shape
+share/dia/shapes/Cisco/man_gold.png
+share/dia/shapes/Cisco/man_gold.shape
+share/dia/shapes/Cisco/man_red.png
+share/dia/shapes/Cisco/man_red.shape
 share/dia/shapes/Cisco/man_woman.png
 share/dia/shapes/Cisco/man_woman.shape
 share/dia/shapes/Cisco/mas_gateway.png
 share/dia/shapes/Cisco/mas_gateway.shape
 share/dia/shapes/Cisco/mau.png
 share/dia/shapes/Cisco/mau.shape
+share/dia/shapes/Cisco/mcu.png
+share/dia/shapes/Cisco/mcu.shape
 share/dia/shapes/Cisco/mdu.png
 share/dia/shapes/Cisco/mdu.shape
 share/dia/shapes/Cisco/me1100.png
 share/dia/shapes/Cisco/me1100.shape
+share/dia/shapes/Cisco/medium_building.png
+share/dia/shapes/Cisco/medium_building.shape
+share/dia/shapes/Cisco/medium_building_blue.png
+share/dia/shapes/Cisco/medium_building_blue.shape
+share/dia/shapes/Cisco/medium_building_subdued.png
+share/dia/shapes/Cisco/medium_building_subdued.shape
 share/dia/shapes/Cisco/metro1500.png
 share/dia/shapes/Cisco/metro1500.shape
 share/dia/shapes/Cisco/mgx8220.png
@@ -534,22 +641,40 @@ share/dia/shapes/Cisco/mgx8240.png
 share/dia/shapes/Cisco/mgx8240.shape
 share/dia/shapes/Cisco/mgx8260.png
 share/dia/shapes/Cisco/mgx8260.shape
+share/dia/shapes/Cisco/mgx_8000_series_voice_gateway.png
+share/dia/shapes/Cisco/mgx_8000_series_voice_gateway.shape
 share/dia/shapes/Cisco/microphone.png
 share/dia/shapes/Cisco/microphone.shape
 share/dia/shapes/Cisco/microwebserver.png
 share/dia/shapes/Cisco/microwebserver.shape
 share/dia/shapes/Cisco/mini_vax.png
 share/dia/shapes/Cisco/mini_vax.shape
+share/dia/shapes/Cisco/mobile_access_ip_phone.png
+share/dia/shapes/Cisco/mobile_access_ip_phone.shape
+share/dia/shapes/Cisco/mobile_access_router.png
+share/dia/shapes/Cisco/mobile_access_router.shape
 share/dia/shapes/Cisco/modem.png
 share/dia/shapes/Cisco/modem.shape
 share/dia/shapes/Cisco/moh_server.png
 share/dia/shapes/Cisco/moh_server.shape
+share/dia/shapes/Cisco/monitor.png
+share/dia/shapes/Cisco/monitor.shape
+share/dia/shapes/Cisco/multi-fabric_server_switch.png
+share/dia/shapes/Cisco/multi-fabric_server_switch.shape
+share/dia/shapes/Cisco/multilayer_remote_switch.png
+share/dia/shapes/Cisco/multilayer_remote_switch.shape
 share/dia/shapes/Cisco/multilayer_switch.png
 share/dia/shapes/Cisco/multilayer_switch.shape
+share/dia/shapes/Cisco/multilayer_switch_with_silicon.png
+share/dia/shapes/Cisco/multilayer_switch_with_silicon.shape
+share/dia/shapes/Cisco/multilayer_switch_with_silicon_subdued.png
+share/dia/shapes/Cisco/multilayer_switch_with_silicon_subdued.shape
 share/dia/shapes/Cisco/multiswitch_device.png
 share/dia/shapes/Cisco/multiswitch_device.shape
 share/dia/shapes/Cisco/mux.png
 share/dia/shapes/Cisco/mux.shape
+share/dia/shapes/Cisco/nat.png
+share/dia/shapes/Cisco/nat.shape
 share/dia/shapes/Cisco/netflow_router.png
 share/dia/shapes/Cisco/netflow_router.shape
 share/dia/shapes/Cisco/netranger.png
@@ -558,20 +683,28 @@ share/dia/shapes/Cisco/netsonar.png
 share/dia/shapes/Cisco/netsonar.shape
 share/dia/shapes/Cisco/network_management.png
 share/dia/shapes/Cisco/network_management.shape
+share/dia/shapes/Cisco/newton.png
+share/dia/shapes/Cisco/newton.shape
 share/dia/shapes/Cisco/octel.png
 share/dia/shapes/Cisco/octel.shape
-share/dia/shapes/Cisco/ons15500.png
-share/dia/shapes/Cisco/ons15500.shape
+share/dia/shapes/Cisco/ons15104.png
+share/dia/shapes/Cisco/ons15104.shape
+share/dia/shapes/Cisco/ons15540.png
+share/dia/shapes/Cisco/ons15540.shape
 share/dia/shapes/Cisco/optical_amplifier.png
 share/dia/shapes/Cisco/optical_amplifier.shape
+share/dia/shapes/Cisco/optical_cross-connect.png
+share/dia/shapes/Cisco/optical_cross-connect.shape
+share/dia/shapes/Cisco/optical_fiber.png
+share/dia/shapes/Cisco/optical_fiber.shape
 share/dia/shapes/Cisco/optical_services_router.png
 share/dia/shapes/Cisco/optical_services_router.shape
 share/dia/shapes/Cisco/optical_transport.png
 share/dia/shapes/Cisco/optical_transport.shape
 share/dia/shapes/Cisco/pad.png
 share/dia/shapes/Cisco/pad.shape
-share/dia/shapes/Cisco/pad_x28.png
-share/dia/shapes/Cisco/pad_x28.shape
+share/dia/shapes/Cisco/pager.png
+share/dia/shapes/Cisco/pager.shape
 share/dia/shapes/Cisco/pbx.png
 share/dia/shapes/Cisco/pbx.shape
 share/dia/shapes/Cisco/pbx_switch.png
@@ -580,20 +713,38 @@ share/dia/shapes/Cisco/pc.png
 share/dia/shapes/Cisco/pc.shape
 share/dia/shapes/Cisco/pc_adapter_card.png
 share/dia/shapes/Cisco/pc_adapter_card.shape
+share/dia/shapes/Cisco/pc_card.png
+share/dia/shapes/Cisco/pc_card.shape
 share/dia/shapes/Cisco/pc_man.png
 share/dia/shapes/Cisco/pc_man.shape
+share/dia/shapes/Cisco/pc_man_left.png
+share/dia/shapes/Cisco/pc_man_left.shape
 share/dia/shapes/Cisco/pc_router_card.png
 share/dia/shapes/Cisco/pc_router_card.shape
+share/dia/shapes/Cisco/pc_software.png
+share/dia/shapes/Cisco/pc_software.shape
 share/dia/shapes/Cisco/pc_video.png
 share/dia/shapes/Cisco/pc_video.shape
+share/dia/shapes/Cisco/pc_with_router-based_software.png
+share/dia/shapes/Cisco/pc_with_router-based_software.shape
 share/dia/shapes/Cisco/pda.png
 share/dia/shapes/Cisco/pda.shape
 share/dia/shapes/Cisco/phone.png
 share/dia/shapes/Cisco/phone.shape
+share/dia/shapes/Cisco/phone_2.png
+share/dia/shapes/Cisco/phone_2.shape
+share/dia/shapes/Cisco/phone_appliance.png
+share/dia/shapes/Cisco/phone_appliance.shape
+share/dia/shapes/Cisco/phone_ethernet.png
+share/dia/shapes/Cisco/phone_ethernet.shape
 share/dia/shapes/Cisco/phone_fax.png
 share/dia/shapes/Cisco/phone_fax.shape
+share/dia/shapes/Cisco/phone_feature.png
+share/dia/shapes/Cisco/phone_feature.shape
 share/dia/shapes/Cisco/pix_firewall.png
 share/dia/shapes/Cisco/pix_firewall.shape
+share/dia/shapes/Cisco/pix_firewall_left.png
+share/dia/shapes/Cisco/pix_firewall_left.shape
 share/dia/shapes/Cisco/printer.png
 share/dia/shapes/Cisco/printer.shape
 share/dia/shapes/Cisco/programmable_switch.png
@@ -612,10 +763,14 @@ share/dia/shapes/Cisco/repeater.png
 share/dia/shapes/Cisco/repeater.shape
 share/dia/shapes/Cisco/route_switch_processor.png
 share/dia/shapes/Cisco/route_switch_processor.shape
+share/dia/shapes/Cisco/route_switch_processor_with_si.png
+share/dia/shapes/Cisco/route_switch_processor_with_si.shape
 share/dia/shapes/Cisco/router.png
 share/dia/shapes/Cisco/router.shape
 share/dia/shapes/Cisco/router_in_building.png
 share/dia/shapes/Cisco/router_in_building.shape
+share/dia/shapes/Cisco/router_subdued.png
+share/dia/shapes/Cisco/router_subdued.shape
 share/dia/shapes/Cisco/router_with_firewall.png
 share/dia/shapes/Cisco/router_with_firewall.shape
 share/dia/shapes/Cisco/router_with_silicon_switch.png
@@ -624,6 +779,10 @@ share/dia/shapes/Cisco/rps.png
 share/dia/shapes/Cisco/rps.shape
 share/dia/shapes/Cisco/running_man.png
 share/dia/shapes/Cisco/running_man.shape
+share/dia/shapes/Cisco/running_man_subdued.png
+share/dia/shapes/Cisco/running_man_subdued.shape
+share/dia/shapes/Cisco/running_woman.png
+share/dia/shapes/Cisco/running_woman.shape
 share/dia/shapes/Cisco/satellite.png
 share/dia/shapes/Cisco/satellite.shape
 share/dia/shapes/Cisco/satellite_dish.png
@@ -634,8 +793,14 @@ share/dia/shapes/Cisco/sc2200_vsc3000_host.png
 share/dia/shapes/Cisco/sc2200_vsc3000_host.shape
 share/dia/shapes/Cisco/scanner.png
 share/dia/shapes/Cisco/scanner.shape
+share/dia/shapes/Cisco/security_appliance.png
+share/dia/shapes/Cisco/security_appliance.shape
+share/dia/shapes/Cisco/server_switch.png
+share/dia/shapes/Cisco/server_switch.shape
 share/dia/shapes/Cisco/server_with_pc_router.png
 share/dia/shapes/Cisco/server_with_pc_router.shape
+share/dia/shapes/Cisco/service_control.png
+share/dia/shapes/Cisco/service_control.shape
 share/dia/shapes/Cisco/sip_proxy_server.png
 share/dia/shapes/Cisco/sip_proxy_server.shape
 share/dia/shapes/Cisco/sitting_woman.png
@@ -646,10 +811,14 @@ share/dia/shapes/Cisco/small_hub.png
 share/dia/shapes/Cisco/small_hub.shape
 share/dia/shapes/Cisco/softphone.png
 share/dia/shapes/Cisco/softphone.shape
-share/dia/shapes/Cisco/software_based_server.png
-share/dia/shapes/Cisco/software_based_server.shape
+share/dia/shapes/Cisco/software-based_router_on_file_server.png
+share/dia/shapes/Cisco/software-based_router_on_file_server.shape
+share/dia/shapes/Cisco/sonet_mux.png
+share/dia/shapes/Cisco/sonet_mux.shape
 share/dia/shapes/Cisco/speaker.png
 share/dia/shapes/Cisco/speaker.shape
+share/dia/shapes/Cisco/ssl_terminator.png
+share/dia/shapes/Cisco/ssl_terminator.shape
 share/dia/shapes/Cisco/standing_man.png
 share/dia/shapes/Cisco/standing_man.shape
 share/dia/shapes/Cisco/stb.png
@@ -658,6 +827,8 @@ share/dia/shapes/Cisco/storage_array.png
 share/dia/shapes/Cisco/storage_array.shape
 share/dia/shapes/Cisco/storage_router.png
 share/dia/shapes/Cisco/storage_router.shape
+share/dia/shapes/Cisco/storage_solution_engine.png
+share/dia/shapes/Cisco/storage_solution_engine.shape
 share/dia/shapes/Cisco/stp.png
 share/dia/shapes/Cisco/stp.shape
 share/dia/shapes/Cisco/sun_workstation.png
@@ -666,10 +837,14 @@ share/dia/shapes/Cisco/supercomputer.png
 share/dia/shapes/Cisco/supercomputer.shape
 share/dia/shapes/Cisco/svx.png
 share/dia/shapes/Cisco/svx.shape
+share/dia/shapes/Cisco/switch_processor.png
+share/dia/shapes/Cisco/switch_processor.shape
 share/dia/shapes/Cisco/system_controller.png
 share/dia/shapes/Cisco/system_controller.shape
 share/dia/shapes/Cisco/tablet.png
 share/dia/shapes/Cisco/tablet.shape
+share/dia/shapes/Cisco/tape_array.png
+share/dia/shapes/Cisco/tape_array.shape
 share/dia/shapes/Cisco/tdm_router.png
 share/dia/shapes/Cisco/tdm_router.shape
 share/dia/shapes/Cisco/telecommuter.png
@@ -678,8 +853,12 @@ share/dia/shapes/Cisco/telecommuter_house.png
 share/dia/shapes/Cisco/telecommuter_house.shape
 share/dia/shapes/Cisco/telecommuter_house_router.png
 share/dia/shapes/Cisco/telecommuter_house_router.shape
+share/dia/shapes/Cisco/telecommuter_house_subdued.png
+share/dia/shapes/Cisco/telecommuter_house_subdued.shape
 share/dia/shapes/Cisco/terminal.png
 share/dia/shapes/Cisco/terminal.shape
+share/dia/shapes/Cisco/terminal_server.png
+share/dia/shapes/Cisco/terminal_server.shape
 share/dia/shapes/Cisco/tokenring.png
 share/dia/shapes/Cisco/tokenring.shape
 share/dia/shapes/Cisco/transpath.png
@@ -690,8 +869,12 @@ share/dia/shapes/Cisco/turret.png
 share/dia/shapes/Cisco/turret.shape
 share/dia/shapes/Cisco/tv.png
 share/dia/shapes/Cisco/tv.shape
-share/dia/shapes/Cisco/ubr910.png
-share/dia/shapes/Cisco/ubr910.shape
+share/dia/shapes/Cisco/ubr910_cable_dsu.png
+share/dia/shapes/Cisco/ubr910_cable_dsu.shape
+share/dia/shapes/Cisco/umg_series.png
+share/dia/shapes/Cisco/umg_series.shape
+share/dia/shapes/Cisco/unity_express.png
+share/dia/shapes/Cisco/unity_express.shape
 share/dia/shapes/Cisco/unity_server.png
 share/dia/shapes/Cisco/unity_server.shape
 share/dia/shapes/Cisco/universal_gateway.png
@@ -702,16 +885,24 @@ share/dia/shapes/Cisco/ups.png
 share/dia/shapes/Cisco/ups.shape
 share/dia/shapes/Cisco/video_camera.png
 share/dia/shapes/Cisco/video_camera.shape
+share/dia/shapes/Cisco/video_camera_right.png
+share/dia/shapes/Cisco/video_camera_right.shape
 share/dia/shapes/Cisco/vip.png
 share/dia/shapes/Cisco/vip.shape
-share/dia/shapes/Cisco/voice_atm_switch.png
-share/dia/shapes/Cisco/voice_atm_switch.shape
-share/dia/shapes/Cisco/voice_commserver.png
-share/dia/shapes/Cisco/voice_commserver.shape
-share/dia/shapes/Cisco/voice_router.png
-share/dia/shapes/Cisco/voice_router.shape
-share/dia/shapes/Cisco/voice_switch.png
-share/dia/shapes/Cisco/voice_switch.shape
+share/dia/shapes/Cisco/virtual_layer_switch.png
+share/dia/shapes/Cisco/virtual_layer_switch.shape
+share/dia/shapes/Cisco/vn2900.png
+share/dia/shapes/Cisco/vn2900.shape
+share/dia/shapes/Cisco/vn5900.png
+share/dia/shapes/Cisco/vn5900.shape
+share/dia/shapes/Cisco/vn5902.png
+share/dia/shapes/Cisco/vn5902.shape
+share/dia/shapes/Cisco/voice-enabled_access_server.png
+share/dia/shapes/Cisco/voice-enabled_access_server.shape
+share/dia/shapes/Cisco/voice-enabled_atm_switch.png
+share/dia/shapes/Cisco/voice-enabled_atm_switch.shape
+share/dia/shapes/Cisco/voice-enabled_router.png
+share/dia/shapes/Cisco/voice-enabled_router.shape
 share/dia/shapes/Cisco/voice_switch2.png
 share/dia/shapes/Cisco/voice_switch2.shape
 share/dia/shapes/Cisco/vpn_concentrator.png
@@ -720,22 +911,50 @@ share/dia/shapes/Cisco/vpn_gateway.png
 share/dia/shapes/Cisco/vpn_gateway.shape
 share/dia/shapes/Cisco/vsc3000.png
 share/dia/shapes/Cisco/vsc3000.shape
+share/dia/shapes/Cisco/wan.png
+share/dia/shapes/Cisco/wan.shape
 share/dia/shapes/Cisco/wavelength_router.png
 share/dia/shapes/Cisco/wavelength_router.shape
+share/dia/shapes/Cisco/wdm.png
+share/dia/shapes/Cisco/wdm.shape
 share/dia/shapes/Cisco/web_browser.png
 share/dia/shapes/Cisco/web_browser.shape
 share/dia/shapes/Cisco/web_cluster.png
 share/dia/shapes/Cisco/web_cluster.shape
+share/dia/shapes/Cisco/wi-fi_tag.png
+share/dia/shapes/Cisco/wi-fi_tag.shape
 share/dia/shapes/Cisco/wireless.png
 share/dia/shapes/Cisco/wireless.shape
 share/dia/shapes/Cisco/wireless_bridge.png
 share/dia/shapes/Cisco/wireless_bridge.shape
+share/dia/shapes/Cisco/wireless_connectivity.png
+share/dia/shapes/Cisco/wireless_connectivity.shape
+share/dia/shapes/Cisco/wireless_location_appliance.png
+share/dia/shapes/Cisco/wireless_location_appliance.shape
+share/dia/shapes/Cisco/wireless_router.png
+share/dia/shapes/Cisco/wireless_router.shape
 share/dia/shapes/Cisco/wireless_transport.png
 share/dia/shapes/Cisco/wireless_transport.shape
+share/dia/shapes/Cisco/wlan_controller.png
+share/dia/shapes/Cisco/wlan_controller.shape
+share/dia/shapes/Cisco/woman.png
+share/dia/shapes/Cisco/woman.shape
+share/dia/shapes/Cisco/woman_blue.png
+share/dia/shapes/Cisco/woman_blue.shape
+share/dia/shapes/Cisco/woman_gold.png
+share/dia/shapes/Cisco/woman_gold.shape
+share/dia/shapes/Cisco/woman_red.png
+share/dia/shapes/Cisco/woman_red.shape
 share/dia/shapes/Cisco/workgroup_director.png
 share/dia/shapes/Cisco/workgroup_director.shape
+share/dia/shapes/Cisco/workgroup_fcis.png
+share/dia/shapes/Cisco/workgroup_fcis.shape
 share/dia/shapes/Cisco/workgroup_switch.png
 share/dia/shapes/Cisco/workgroup_switch.shape
+share/dia/shapes/Cisco/workgroup_switch_subdued.png
+share/dia/shapes/Cisco/workgroup_switch_subdued.shape
+share/dia/shapes/Cisco/workgroup_switch_voice-enabled.png
+share/dia/shapes/Cisco/workgroup_switch_voice-enabled.shape
 share/dia/shapes/Cisco/workstation.png
 share/dia/shapes/Cisco/workstation.shape
 share/dia/shapes/Cisco/www_server.png
@@ -967,6 +1186,15 @@ share/dia/shapes/Flowchart/transaction.png
 share/dia/shapes/Flowchart/transaction.shape
 share/dia/shapes/Flowchart/transmittape.png
 share/dia/shapes/Flowchart/transmittape.shape
+share/dia/shapes/Gane_and_Sarson/
+share/dia/shapes/Gane_and_Sarson/alt-entity.png
+share/dia/shapes/Gane_and_Sarson/alt-entity.shape
+share/dia/shapes/Gane_and_Sarson/data_store.png
+share/dia/shapes/Gane_and_Sarson/data_store.shape
+share/dia/shapes/Gane_and_Sarson/entity.png
+share/dia/shapes/Gane_and_Sarson/entity.shape
+share/dia/shapes/Gane_and_Sarson/process.png
+share/dia/shapes/Gane_and_Sarson/process.shape
 share/dia/shapes/Logic/
 share/dia/shapes/Logic/and.png
 share/dia/shapes/Logic/and.shape
@@ -1255,6 +1483,7 @@ share/dia/shapes/sybase/rsm.shape
 share/dia/shapes/sybase/stableq.png
 share/dia/shapes/sybase/stableq.shape
 share/dia/sheets/
+share/dia/sheets/AADL.sheet
 share/dia/sheets/Assorted.sheet
 share/dia/sheets/ChemEng.sheet
 share/dia/sheets/Circuit.sheet
@@ -1263,56 +1492,57 @@ share/dia/sheets/Cybernetics.sheet
 share/dia/sheets/EML.sheet
 share/dia/sheets/ER/
 share/dia/sheets/ER.sheet
-share/dia/sheets/ER/weakentity.xpm
+share/dia/sheets/ER/weakentity.png
 share/dia/sheets/Electric.sheet
 share/dia/sheets/FS.sheet
 share/dia/sheets/Flowchart.sheet
 share/dia/sheets/GRAFCET/
 share/dia/sheets/GRAFCET.sheet
-share/dia/sheets/GRAFCET/etapei.xpm
-share/dia/sheets/GRAFCET/etapemc.xpm
-share/dia/sheets/GRAFCET/etapeme.xpm
-share/dia/sheets/GRAFCET/etapems.xpm
-share/dia/sheets/GRAFCET/etapesp.xpm
-share/dia/sheets/GRAFCET/vergent_and.xpm
+share/dia/sheets/GRAFCET/etapei.png
+share/dia/sheets/GRAFCET/etapemc.png
+share/dia/sheets/GRAFCET/etapeme.png
+share/dia/sheets/GRAFCET/etapems.png
+share/dia/sheets/GRAFCET/etapesp.png
+share/dia/sheets/GRAFCET/vergent_and.png
+share/dia/sheets/Gane_and_Sarson.sheet
 share/dia/sheets/IsometricMap.sheet
 share/dia/sheets/Istar/
 share/dia/sheets/Istar.sheet
-share/dia/sheets/Istar/agent.xpm
-share/dia/sheets/Istar/decomposition.xpm
-share/dia/sheets/Istar/dependency.xpm
-share/dia/sheets/Istar/goal.xpm
-share/dia/sheets/Istar/means_ends.xpm
-share/dia/sheets/Istar/neg_contrib.xpm
-share/dia/sheets/Istar/pos_contrib.xpm
-share/dia/sheets/Istar/position.xpm
-share/dia/sheets/Istar/role.xpm
-share/dia/sheets/Istar/task.xpm
+share/dia/sheets/Istar/agent.png
+share/dia/sheets/Istar/decomposition.png
+share/dia/sheets/Istar/dependency.png
+share/dia/sheets/Istar/goal.png
+share/dia/sheets/Istar/means_ends.png
+share/dia/sheets/Istar/neg_contrib.png
+share/dia/sheets/Istar/pos_contrib.png
+share/dia/sheets/Istar/position.png
+share/dia/sheets/Istar/role.png
+share/dia/sheets/Istar/task.png
 share/dia/sheets/Jackson/
 share/dia/sheets/Jackson.sheet
-share/dia/sheets/Jackson/designed_domain.xpm
-share/dia/sheets/Jackson/machine_domain.xpm
-share/dia/sheets/Jackson/req_phen.xpm
+share/dia/sheets/Jackson/designed_domain.png
+share/dia/sheets/Jackson/machine_domain.png
+share/dia/sheets/Jackson/req_phen.png
 share/dia/sheets/KAOS/
 share/dia/sheets/KAOS.sheet
-share/dia/sheets/KAOS/and-complete-ref.xpm
-share/dia/sheets/KAOS/and-ref.xpm
-share/dia/sheets/KAOS/assumption.xpm
-share/dia/sheets/KAOS/capable-of.xpm
-share/dia/sheets/KAOS/conflicts.xpm
-share/dia/sheets/KAOS/controls.xpm
-share/dia/sheets/KAOS/input.xpm
-share/dia/sheets/KAOS/monitors.xpm
-share/dia/sheets/KAOS/obstacle.xpm
-share/dia/sheets/KAOS/obstructs.xpm
-share/dia/sheets/KAOS/op-ref.xpm
-share/dia/sheets/KAOS/or-complete-ref.xpm
-share/dia/sheets/KAOS/or-ref.xpm
-share/dia/sheets/KAOS/output.xpm
-share/dia/sheets/KAOS/performs.xpm
-share/dia/sheets/KAOS/requirement.xpm
-share/dia/sheets/KAOS/responsibility.xpm
-share/dia/sheets/KAOS/softgoal.xpm
+share/dia/sheets/KAOS/and-complete-ref.png
+share/dia/sheets/KAOS/and-ref.png
+share/dia/sheets/KAOS/assumption.png
+share/dia/sheets/KAOS/capable-of.png
+share/dia/sheets/KAOS/conflicts.png
+share/dia/sheets/KAOS/controls.png
+share/dia/sheets/KAOS/input.png
+share/dia/sheets/KAOS/monitors.png
+share/dia/sheets/KAOS/obstacle.png
+share/dia/sheets/KAOS/obstructs.png
+share/dia/sheets/KAOS/op-ref.png
+share/dia/sheets/KAOS/or-complete-ref.png
+share/dia/sheets/KAOS/or-ref.png
+share/dia/sheets/KAOS/output.png
+share/dia/sheets/KAOS/performs.png
+share/dia/sheets/KAOS/requirement.png
+share/dia/sheets/KAOS/responsibility.png
+share/dia/sheets/KAOS/softgoal.png
 share/dia/sheets/Logic.sheet
 share/dia/sheets/MSE.sheet
 share/dia/sheets/Misc.sheet
@@ -1331,7 +1561,7 @@ share/dia/sheets/ciscocomputer.sheet
 share/dia/sheets/ciscohub.sheet
 share/dia/sheets/ciscomisc.sheet
 share/dia/sheets/cisconetwork.sheet
-share/dia/sheets/ciscorouter.sheet
+share/dia/sheets/ciscotelephony.sheet
 share/dia/sheets/civil.sheet
 share/dia/sheets/jigsaw.sheet
 share/dia/sheets/network.sheet
@@ -1349,12 +1579,32 @@ share/gnome/
 share/gnome/help/
 share/gnome/help/dia/
 share/gnome/help/dia/en/
+share/gnome/help/dia/en/authors.xml
 share/gnome/help/dia/en/dia.xml
+share/gnome/help/dia/en/entities.xml
 share/gnome/help/dia/en/graphics/
 share/gnome/help/dia/en/graphics/greendots.png
 share/gnome/help/dia/en/graphics/home_network.png
 share/gnome/help/dia/en/graphics/line_icon.png
 share/gnome/help/dia/en/graphics/line_props.png
+share/gnome/help/dia/en/intro.xml
+share/gnome/help/dia/en/license.xml
+share/gnome/help/dia/en/usage-canvas.xml
+share/gnome/help/dia/en/usage-customization.xml
+share/gnome/help/dia/en/usage-layers.xml
+share/gnome/help/dia/en/usage-loadsave.xml
+share/gnome/help/dia/en/usage-objects-basic.xml
+share/gnome/help/dia/en/usage-objects-selecting.xml
+share/gnome/help/dia/en/usage-objects-special.xml
+share/gnome/help/dia/en/usage-objects.xml
+share/gnome/help/dia/en/usage-quickstart.xml
+share/gnome/help/dia/eu/
+share/gnome/help/dia/eu/dia.xml
+share/gnome/help/dia/eu/graphics/
+share/gnome/help/dia/eu/graphics/greendots.png
+share/gnome/help/dia/eu/graphics/home_network.png
+share/gnome/help/dia/eu/graphics/line_icon.png
+share/gnome/help/dia/eu/graphics/line_props.png
 share/gnome/help/dia/pl/
 share/gnome/help/dia/pl/dia.xml
 share/gnome/help/dia/pl/graphics/
@@ -1368,6 +1618,10 @@ share/locale/az/
 share/locale/az/LC_MESSAGES/
 share/locale/az/LC_MESSAGES/dia.mo
 share/locale/be/LC_MESSAGES/dia.mo
+share/locale/bg/LC_MESSAGES/dia.mo
+share/locale/bs/
+share/locale/bs/LC_MESSAGES/
+share/locale/bs/LC_MESSAGES/dia.mo
 share/locale/ca/LC_MESSAGES/dia.mo
 share/locale/cs/LC_MESSAGES/dia.mo
 share/locale/da/LC_MESSAGES/dia.mo
@@ -1380,6 +1634,9 @@ share/locale/en_GB/
 share/locale/en_GB/LC_MESSAGES/
 share/locale/en_GB/LC_MESSAGES/dia.mo
 share/locale/es/LC_MESSAGES/dia.mo
+share/locale/eu/
+share/locale/eu/LC_MESSAGES/
+share/locale/eu/LC_MESSAGES/dia.mo
 share/locale/fi/LC_MESSAGES/dia.mo
 share/locale/fr/LC_MESSAGES/dia.mo
 share/locale/ga/LC_MESSAGES/dia.mo
@@ -1388,6 +1645,7 @@ share/locale/gu/LC_MESSAGES/
 share/locale/gu/LC_MESSAGES/dia.mo
 share/locale/hr/LC_MESSAGES/dia.mo
 share/locale/hu/LC_MESSAGES/dia.mo
+share/locale/id/LC_MESSAGES/dia.mo
 share/locale/is/
 share/locale/is/LC_MESSAGES/
 share/locale/is/LC_MESSAGES/dia.mo
@@ -1406,14 +1664,20 @@ share/locale/mn/LC_MESSAGES/dia.mo
 share/locale/ms/
 share/locale/ms/LC_MESSAGES/
 share/locale/ms/LC_MESSAGES/dia.mo
+share/locale/nb/LC_MESSAGES/dia.mo
+share/locale/ne/
+share/locale/ne/LC_MESSAGES/
+share/locale/ne/LC_MESSAGES/dia.mo
 share/locale/nl/LC_MESSAGES/dia.mo
 share/locale/nn/LC_MESSAGES/dia.mo
-share/locale/no/LC_MESSAGES/dia.mo
 share/locale/pl/LC_MESSAGES/dia.mo
 share/locale/pt/LC_MESSAGES/dia.mo
 share/locale/pt_BR/LC_MESSAGES/dia.mo
 share/locale/ro/LC_MESSAGES/dia.mo
 share/locale/ru/LC_MESSAGES/dia.mo
+share/locale/rw/
+share/locale/rw/LC_MESSAGES/
+share/locale/rw/LC_MESSAGES/dia.mo
 share/locale/sk/LC_MESSAGES/dia.mo
 share/locale/sl/LC_MESSAGES/dia.mo
 share/locale/sq/