diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 2693962f..471a68c5 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -5,5 +5,17 @@ FREEJ_FLAGS = @SDL_CFLAGS@ @FT2_CFLAGS@ @XIPH_CFLAGS@ @UNICAP_CFLAGS@ @FFMPEG_CF
 # SWIG_SOURCES = freej.i
 # SWIG_CFLAGS = -modern ${SWIG_ADD_CFLAGS}
 
+DIST_SUBDIRS = java perl python ruby
+
 SUBDIRS = @BINDING_DIRS@
 
+EXTRA_DIST = freej.i   \
+             javapre.i \
+             luapost.i \
+             perlpre.i \
+             pypost.i  \
+             pypre.i   \
+             rbpost.i  \
+             rbpre.i   \
+             test.lua
+
diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index 5e44bc67..500d771b 100644
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -11,7 +11,7 @@ pkgjavaexecdir = /usr/lib/jni
 pkgjavaexec_LTLIBRARIES = libfreej_g.la
 libfreej_g_la_CXXFLAGS = $(FREEJ_FLAGS) @JAVA_CFLAGS@
 libfreej_g_la_LDFLAGS = $(JAVA_LDFLAGS) 
-libfreej_g_la_SOURCES = freej_java.cpp
+nodist_libfreej_g_la_SOURCES = freej_java.cpp
 
 
 clean-local:
diff --git a/bindings/perl/Makefile.am b/bindings/perl/Makefile.am
index 8c49fbca..fec2ee7b 100644
--- a/bindings/perl/Makefile.am
+++ b/bindings/perl/Makefile.am
@@ -17,7 +17,7 @@ pkgperlexecdir = $(perl_archdir)/auto/Freej
 pkgperlexec_LTLIBRARIES = Freej.la
 Freej_la_LDFLAGS = -module -avoid-version
 Freej_la_CXXFLAGS = -I$(perl_archdir)/CORE $(FREEJ_FLAGS) @PERL_CFLAGS@
-Freej_la_SOURCES = $(PERL_SOURCE)
+nodist_Freej_la_SOURCES = $(PERL_SOURCE)
 Freej_la_LIBADD = -L$(top_builddir)/src/.libs -lfreej
 
 clean-local:
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index d6614273..7210f612 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -7,13 +7,14 @@ BUILT_SOURCES = freej_py.cpp
 freej_py.cpp: $(top_srcdir)/bindings/freej.i
 		@SWIG_COMMAND@ -python -threads -shadow -o freej_py.cpp @SWIG_IFACE@
 
-pkgpython_PYTHON = freej.py __init__.py
+pkgpython_PYTHON = __init__.py
+nodist_pkgpython_PYTHON = freej.py
 pkgpyexec_LTLIBRARIES = _freej.la
 pkgpython_instdir = $(pythondir)
 #pkgpython_inst_PYTHON = freej.pth
 
 
-_freej_la_SOURCES = freej_py.cpp
+nodist__freej_la_SOURCES = freej_py.cpp
 _freej_la_CXXFLAGS =  $(FREEJ_FLAGS) @PYTHON_CPPFLAGS@
 _freej_la_LDFLAGS = -module -avoid-version
 _freej_la_LIBADD = $(PY_LIBS) -L$(top_builddir)/src/.libs -lfreej
diff --git a/bindings/ruby/Makefile.am b/bindings/ruby/Makefile.am
index a0b5ef68..705e115a 100644
--- a/bindings/ruby/Makefile.am
+++ b/bindings/ruby/Makefile.am
@@ -10,11 +10,12 @@ freej_ruby.cpp: $(top_srcdir)/bindings/freej.i
 pkgrubyexecdir = @RUBY_ARCHDIR@
 pkgrubyexec_LTLIBRARIES = Freej.la
 
-Freej_la_SOURCES = freej_ruby.cpp
+nodist_Freej_la_SOURCES = freej_ruby.cpp
 Freej_la_CXXFLAGS =  $(FREEJ_FLAGS) @RUBY_CFLAGS@
 Freej_la_LDFLAGS = $(RUBY_LDFLAGS) -module -avoid-version
 Freej_la_LIBADD = $(RUBY_LIBS) -L$(top_builddir)/src/.libs -lfreej
 
+EXTRA_DIST = list_classes.rb list_classes.sh
 
 clean-local:
 	rm -rf .libs _libs
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2ec98be2..0a536757 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,3 +1,16 @@
+# We do not dist javascript because it is not autotoolized
+DIST_SUBDIRS =  ccvt       \
+                sdl_image  \
+                sdl_gfx    \
+                sdl_ttf    \
+                slw        \
+                lo         \
+                shout      \
+                frei0r     \
+                goom       \
+                cwiid      \
+                flash
+
 SUBDIRS = 	ccvt			\
 		sdl_image		\
 		sdl_gfx			\