diff --git a/.gitignore b/.gitignore
index 1385968..600c4b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,3 +90,5 @@ src/sockets-constants.ads
 src/sockets-thin.ads
 src/split
 src/.libs
+ChangeLog
+adasockets-*.tar.gz
diff --git a/Makefile.am b/Makefile.am
index 9cdabc6..5e78ac2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,5 +14,24 @@ else
 SUBDIRS_EXAMPLES =
 endif
 
+EXTRA_DIST = AUTHORS COPYING GMGPL INSTALL NEWS README README.RTEMS \
+	rtems/ChangeLog rtems/create_constants_c.sh rtems/Makefile.RTEMS \
+	rtems/README rtems/rtems_main.c rtems/sockets-constants-rtems.ads \
+	ChangeLog Makefile.VMS \
+	contrib/vms/README contrib/vms/sockets-constants.ads \
+	contrib/win32/adasockets/build.bat contrib/win32/adasockets/clean.bat \
+	contrib/win32/adasockets/Readme.txt contrib/win32/distr \
+	contrib/win32/Readme.txt \
+	support/adacompiler \
+	vms/constants.c_pre vms/constants.list vms/create_constants_ads.com \
+	vms/create_constants_c.com vms/Makefile.VMS
+
+CLEANFILES = ChangeLog
+
+ChangeLog: never
+	(cd ${srcdir} && git2cl) > ChangeLog
+
+never::
+
 version:
 	@echo $(PACKAGE)-$(VERSION)
\ No newline at end of file
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5713898..e325a47 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -8,6 +8,11 @@ ADADOC_ARGS = --subblock=arg=argname,argmode,argtype,argdefault,argdesc \
 
 DISTCLEANFILES =	*.defs ${adasockets_TEXINFOS}
 
+EXTRA_DIST = adasockets.pdf adasockets.ps adasockets.dvi \
+	${info_TEXINFOS} ${adasockets_TEXINFOS} \
+	adadoc.tpl sockets.desc sockets-multicast.desc \
+	sockets-naming.desc
+
 all-local:: adasockets.ps adasockets.pdf
 
 docdir = ${DESTDIR}${prefix}/share/doc/adasockets
diff --git a/examples/Makefile.am b/examples/Makefile.am
index a2dc0eb..6de871d 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -21,4 +21,8 @@ value: never
 DISTCLEANFILES = tcprelay listener multi stream_listener stream_sender value
 CLEANFILES = *.o *.ali b_*.c b~*.ad[bs]
 
+EXTRA_DIST = Makefile.RTEMS Makefile.VMS \
+	multi.adb rtems_init.c rtems_networkconfig.h stream_listener.adb \
+	listener.adb stream_sender.adb tcprelay.adb value.adb
+
 never::
diff --git a/man/Makefile.am b/man/Makefile.am
index 3df1446..0b2d375 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1 +1,2 @@
 man_MANS = adasockets-config.1
+EXTRA_DIST = ${man_MANS}
diff --git a/src/Makefile.am b/src/Makefile.am
index af2ca2f..6ca7dd8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,27 +3,33 @@ privatelibdir = $(libdir)/adasockets
 bin_SCRIPTS = adasockets-config
 
 lib_LTLIBRARIES = libadasockets.la
-libadasockets_la_SOURCES = $(ADA_SRCS)
-libadasockets_la_LDFLAGS = -version-info $(LIBVERSIONINFO)
-libadasockets_la_LINK = $(LIBTOOL) --tag=CC --mode=link $(CC) \
-	-o libadasockets.la
-
-ADA_SRCS = \
-	sockets-constants.ads \
-	sockets-link.ads \
+dist_libadasockets_la_SOURCES = \
 	sockets-multicast.ads \
 	sockets-multicast.adb \
 	sockets-naming.ads \
 	sockets-naming.adb \
 	sockets-stream_io.ads \
 	sockets-stream_io.adb \
-	sockets-thin.ads \
-	sockets-types.ads \
 	sockets-utils.ads \
 	sockets-utils.adb \
 	sockets.ads \
-	sockets.adb \
-	$(ADA_SRCS_WIN)
+	sockets.adb
+nodist_libadasockets_la_SOURCES = \
+	sockets-thin.ads \
+	sockets-constants.ads \
+	sockets-link.ads \
+	sockets-types.ads
+libadasockets_la_LDFLAGS = -version-info $(LIBVERSIONINFO)
+libadasockets_la_LINK = $(LIBTOOL) --tag=CC --mode=link $(CC) \
+	-o libadasockets.la
+
+EXTRA_DIST = Makefile.RTEMS Makefile.VMS sockets-vms_link.ads \
+	sockets-windows_link.ads sockets-windows_link.adb \
+	sockets-link.ads.vms \
+	sockets-thin.adb.vms sockets-thin.adb.win32 \
+	sockets-thin.ads.unix sockets-thin.ads.vms sockets-thin.ads.win32 \
+	constants.c constants.sh \
+	split.adb
 
 ADA_OBJECTS = \
 	sockets-constants.o \
@@ -36,7 +42,7 @@ ADA_OBJECTS = \
 	sockets-utils.o \
 	sockets.o
 
-ALIS = $(ADA_OBJECTS:.o=.ali) $(ADA_OBJECTS_WIN:.o=.ali)
+ALIS = $(ADA_OBJECTS:.o=.ali)
 
 ADACOMPILER = $(top_srcdir)/support/adacompiler
 
@@ -44,7 +50,8 @@ ADAFLAGS = @ADAFLAGS@ -I. -I$(srcdir)
 
 CLEANFILES = *.o *.ali b~*
 DISTCLEANFILES = b_split.c split constants_nodef \
-		sockets-thin.ads sockets-thin.adb
+		sockets-thin.ads sockets-thin.adb \
+		sockets-constants.ads
 
 constants_nodef: constants.c config.h
 	$(CC) -I. -o constants_nodef $(srcdir)/constants.c
@@ -57,10 +64,10 @@ split: $(srcdir)/split.adb
 	$(GNATMAKE) -g -O2 $(srcdir)/split.adb
 
 if WIN32
-ADA_SRCS_WIN=	sockets-windows_link.ads sockets-windows_link.adb \
-			sockets-thin.adb
-ADA_OBJECTS_WIN=	sockets-windows_link.o
-ADA_OBJECTS_WIN_LO=	$(ADA_OBJECTS_WIN:.o=.lo)
+nodist_libadasockets_la_SOURCES += \
+	sockets-windows_link.ads sockets-windows_link.adb \
+	sockets-thin.adb
+ADA_OBJECTS +=	sockets-windows_link.o
 
 sockets-thin.ads: $(srcdir)/sockets-thin.ads.win32
 	cp $(srcdir)/sockets-thin.ads.win32 sockets-thin.ads
@@ -88,7 +95,7 @@ install-data-local: all
 	rm -rf $(DESTDIR)$(privatelibdir)
 	$(mkinstalldirs) $(DESTDIR)$(privatelibdir)
 	$(INSTALL) -m 444 $(ALIS) $(DESTDIR)$(privatelibdir)
-	for i in $(ADA_SRCS); do \
+	for i in $(dist_libadasockets_la_SOURCES) $(nodist_libadasockets_la_SOURCES); do \
 	  if test -f $$i; then \
 	    $(INSTALL) -m 644 $$i $(DESTDIR)$(privatelibdir); \
 	  else \
diff --git a/utils/make_distrib b/utils/make_distrib
deleted file mode 100755
index 8baff52..0000000
--- a/utils/make_distrib
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh -e
-#
-# This script builds a compressed archive suitable for distribution.
-#
-# Usage: make_distrib
-#
-#   dir   : the distribution will unpack in directory <dir> and will be
-#           named <dir>.tar.gz (where <dir> is the result of make version)
-#
-# The file MANIFEST contains the list of files to be included in this
-# archive, one file per line.
-#
-
-umask 022
-dir=temp$$
-prev=`pwd`
-tmp=${TMPDIR-/tmp}/t$$
-mkdir -p $tmp/$dir
-tar cf - . | (cd $tmp/$dir && tar xpBf -)
-chmod -R u+w $tmp/$dir
-cd $tmp/$dir
-echo Generating ChangeLog
-git log --pretty=full > ChangeLog
-echo Generating auto-generated files
-autoreconf --verbose --install --force
-sleep 1
-echo Configuring
-./configure
-sleep 1
-echo Extracting the version
-newdir=`make version`
-echo Version is $newdir
-echo Building documentation
-(cd doc && make adasockets.info adasockets.dvi && dvips -o adasockets.ps adasockets.dvi && ps2pdf adasockets.ps adasockets.pdf)
-echo Setting timestamps on documentation
-sleep 2 && (cd doc && touch adasockets.info adasockets.ps adasockets.pdf)
-echo Adapting modes
-chmod -R +w .
-chmod -R og=u-w .
-flist=""
-echo Packaging
-for i in `cat MANIFEST`; do
-  flist="${flist} ${newdir}/${i}"
-done
-cd ..
-echo Renaming directory to $newdir
-mv $dir $newdir
-dir=$newdir
-fakeroot tar cvf ${dir}.tar ${flist}
-gzip --best ${dir}.tar
-mv ${dir}.tar.gz ${prev}
-cd ${prev}
-rm -rf ${tmp}