Index: libltdl/ltdl.c
--- libltdl/ltdl.c.orig	2005-05-04 03:31:31 +0200
+++ libltdl/ltdl.c	2005-05-06 09:26:00 +0200
@@ -53,10 +53,6 @@
 #  include <ctype.h>
 #endif
 
-#if HAVE_MALLOC_H
-#  include <malloc.h>
-#endif
-
 #if HAVE_MEMORY_H
 #  include <memory.h>
 #endif
Index: pixmaps/Makefile.in
--- pixmaps/Makefile.in.orig	2005-05-04 03:31:34 +0200
+++ pixmaps/Makefile.in	2005-05-06 09:26:00 +0200
@@ -95,7 +95,7 @@
 version_major = @version_major@
 version_minor = @version_minor@
 
-pixmapsdir = $(pkgdatadir)/$(version_major)/pixmaps
+pixmapsdir = $(pkgdatadir)/pixmaps
 
 pixmaps_DATA = \
 	incomplete.xpm \
Index: plugins/BPF-Filter/Makefile.in
--- plugins/BPF-Filter/Makefile.in.orig	2005-05-04 03:31:34 +0200
+++ plugins/BPF-Filter/Makefile.in	2005-05-06 09:26:00 +0200
@@ -102,7 +102,7 @@
 AM_LDFLAGS = -L$(top_srcdir)/src
 INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
-pkgdir = $(pkgdatadir)/$(version_major)/plugins
+pkgdir = $(pkgdatadir)/plugins
 
 pkg_LTLIBRARIES = nd_bpf.la
 
Index: plugins/ChecksumFix/Makefile.in
--- plugins/ChecksumFix/Makefile.in.orig	2005-05-04 03:31:34 +0200
+++ plugins/ChecksumFix/Makefile.in	2005-05-06 09:26:00 +0200
@@ -102,7 +102,7 @@
 AM_LDFLAGS = -L$(top_srcdir)/src
 INCLUDES = @gtk_cflags@ @LIBNETDUDE_CFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
-pkgdir = $(pkgdatadir)/$(version_major)/plugins
+pkgdir = $(pkgdatadir)/plugins
 
 pkg_LTLIBRARIES = nd_cksumfix.la
 
Index: protocols/arp/Makefile.in
--- protocols/arp/Makefile.in.orig	2005-05-04 03:31:35 +0200
+++ protocols/arp/Makefile.in	2005-05-06 09:26:00 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/arp
+pkgincludedir = $(includedir)/netdude/protocols/arp
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -103,7 +103,7 @@
                        -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
 
-pkgdir = $(pkgdatadir)/$(version_major)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = nd_arp.la 
 
Index: protocols/ether/Makefile.in
--- protocols/ether/Makefile.in.orig	2005-05-04 03:31:35 +0200
+++ protocols/ether/Makefile.in	2005-05-06 09:26:00 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/ether
+pkgincludedir = $(includedir)/netdude/protocols/ether
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -103,7 +103,7 @@
                        -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
 
-pkgdir = $(pkgdatadir)/$(version_major)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = nd_ethernet.la 
 
Index: protocols/fddi/Makefile.in
--- protocols/fddi/Makefile.in.orig	2005-05-04 03:31:35 +0200
+++ protocols/fddi/Makefile.in	2005-05-06 09:26:00 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/fddi
+pkgincludedir = $(includedir)/netdude/protocols/fddi
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -103,7 +103,7 @@
                        -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
 
-pkgdir = $(pkgdatadir)/$(version_major)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = nd_fddi.la 
 
Index: protocols/icmp/Makefile.in
--- protocols/icmp/Makefile.in.orig	2005-05-04 03:31:35 +0200
+++ protocols/icmp/Makefile.in	2005-05-06 09:26:00 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/icmp
+pkgincludedir = $(includedir)/netdude/protocols/icmp
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -103,7 +103,7 @@
                        -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
 
-pkgdir = $(pkgdatadir)/$(version_major)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = nd_icmp.la 
 
Index: protocols/ip/Makefile.in
--- protocols/ip/Makefile.in.orig	2005-05-04 03:31:35 +0200
+++ protocols/ip/Makefile.in	2005-05-06 09:26:00 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/ip
+pkgincludedir = $(includedir)/netdude/protocols/ip
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -103,7 +103,7 @@
                        -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
 
-pkgdir = $(pkgdatadir)/$(version_major)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = nd_ip.la 
 
Index: protocols/linux-sll/Makefile.in
--- protocols/linux-sll/Makefile.in.orig	2005-05-04 03:31:35 +0200
+++ protocols/linux-sll/Makefile.in	2005-05-06 09:26:00 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/linux-sll
+pkgincludedir = $(includedir)/netdude/protocols/linux-sll
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -103,7 +103,7 @@
                        -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
 
-pkgdir = $(pkgdatadir)/$(version_major)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = nd_sll.la 
 
Index: protocols/snap/Makefile.in
--- protocols/snap/Makefile.in.orig	2005-05-04 03:31:35 +0200
+++ protocols/snap/Makefile.in	2005-05-06 09:26:00 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/snap
+pkgincludedir = $(includedir)/netdude/protocols/snap
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -103,7 +103,7 @@
                        -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
 
-pkgdir = $(pkgdatadir)/$(version_major)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = nd_snap.la 
 
Index: protocols/tcp/Makefile.in
--- protocols/tcp/Makefile.in.orig	2005-05-04 03:31:35 +0200
+++ protocols/tcp/Makefile.in	2005-05-06 09:26:00 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/tcp
+pkgincludedir = $(includedir)/netdude/protocols/tcp
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -103,7 +103,7 @@
                        -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
 
-pkgdir = $(pkgdatadir)/$(version_major)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = nd_tcp.la 
 
Index: protocols/udp/Makefile.in
--- protocols/udp/Makefile.in.orig	2005-05-04 03:31:35 +0200
+++ protocols/udp/Makefile.in	2005-05-06 09:26:00 +0200
@@ -64,7 +64,7 @@
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-pkgincludedir = $(includedir)/netdude/$(version_major)/protocols/udp
+pkgincludedir = $(includedir)/netdude/protocols/udp
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -103,7 +103,7 @@
                        -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall
 
 
-pkgdir = $(pkgdatadir)/$(version_major)/protocols
+pkgdir = $(pkgdatadir)/protocols
 
 pkg_LTLIBRARIES = nd_udp.la 
 
Index: src/Makefile.in
--- src/Makefile.in.orig	2005-05-04 03:31:35 +0200
+++ src/Makefile.in	2005-05-06 09:26:00 +0200
@@ -65,7 +65,7 @@
 OBJEXT = @OBJEXT@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 
-pkgincludedir = $(includedir)/netdude/$(version_major)
+pkgincludedir = $(includedir)/netdude
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
Index: src/nd_gui.c
--- src/nd_gui.c.orig	2005-05-04 00:03:12 +0200
+++ src/nd_gui.c	2005-05-06 09:26:00 +0200
@@ -116,7 +116,7 @@
   gtk_widget_realize(win);
   incomplete_pmap = gdk_pixmap_create_from_xpm(win->window, &incomplete_mask,
 					       &gs->bg[GTK_STATE_NORMAL],
-					       PACKAGE_DATA_DIR "/" VERSION_MAJOR "/pixmaps/incomplete.xpm");
+					       PACKAGE_DATA_DIR "/pixmaps/incomplete.xpm");
 
   /* Init red and yellow: */
   for (i = 0; i < 5; i++)
Index: src/nd_main.c
--- src/nd_main.c.orig	2004-05-11 01:39:18 +0200
+++ src/nd_main.c	2005-05-06 09:26:00 +0200
@@ -154,14 +154,14 @@
 	}
       else if (!strcmp(argv[i], "--include-dir"))
 	{
-	  printf("%s\n", PACKAGE_INCLUDE_DIR"/netdude/"VERSION_MAJOR);
+	  printf("%s\n", PACKAGE_INCLUDE_DIR"/netdude");
 	  exit(0);
 	}
       else if (!strcmp(argv[i], "--cflags"))
 	{
 	  printf("%s %s -I%s\n",
 		 LIBNETDUDE_CFLAGS, GTK_CFLAGS,
-		 PACKAGE_INCLUDE_DIR"/netdude/"VERSION_MAJOR);
+		 PACKAGE_INCLUDE_DIR"/netdude");
 	  exit(0);
 	}
       else if (!strcmp(argv[i], "--proto-dir"))
@@ -486,7 +486,7 @@
   gtk_set_locale ();
   gtk_init (&argc, &argv);
 
-  add_pixmap_directory (PACKAGE_DATA_DIR "/" VERSION_MAJOR "/pixmaps");
+  add_pixmap_directory (PACKAGE_DATA_DIR "/pixmaps");
   add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps");
 
   /*