diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index cda1e4c9f..427a35de1 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -2,9 +2,6 @@
 # Hamlib bindings using SWIG
 # more information on swig at http://www.swig.org
 #
-# note:
-#  - VPATH building does not work yet
-#  - Tcl install procedure is not complete yet
 
 #INCLUDES = @INCLUDES@ -Dbool=char -I@PERL_INC_DIR@ @TCL_INCLUDE_SPEC@ -I$(top_srcdir)/bindings
 INCLUDES = @INCLUDES@ -I$(top_srcdir)/bindings @TCL_INCLUDE_SPEC@ @PYTHON_CPPFLAGS@
@@ -19,11 +16,11 @@ hamlibperl_wrap.c: hamlib.swg $(SWIGDEP)
 	$(SWIG) -perl5 -shadow @INCLUDES@ -I$(top_srcdir)/bindings -o $@ \
 			`test -f hamlib.swg || echo '$(srcdir)/'`hamlib.swg
 
-# Add  LIB="$(libdir)"  to install in private place
 Hamlib-pl.mk: $(srcdir)/Makefile.PL
 	test -f Makefile.PL || $(LN_S) $(srcdir)/Makefile.PL Makefile.PL
 	perl `test -f Makefile.PL || echo '$(srcdir)/'`Makefile.PL \
-			MAKEFILE=Hamlib-pl.mk INST_MAN3DIR="$(mandir)" \
+			MAKEFILE=Hamlib-pl.mk \
+			PREFIX="$(prefix)" \
 			INC="$(INCLUDES)"  \
 			CC="$(CC)"  \
 			OBJECT="hamlibperl_wrap.o" VERSION="$(PACKAGE_VERSION)" \
@@ -47,12 +44,17 @@ distcheck-perl: Hamlib-pl.mk
 install-perl: Hamlib-pl.mk
 	$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk install
 
+uninstall-perl: Hamlib-pl.mk
+	$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk uninstall
+
 
 ##########################################
 # Tcl binding
 
 tcl_ltlib = hamlibtcl.la
 
+tcldir = $(prefix)/lib/tcl
+
 PKG_VER=1.0
 DLL=hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@
 
@@ -60,6 +62,9 @@ nodist_hamlibtcl_la_SOURCES = hamlibtcl_wrap.c
 hamlibtcl_la_LDFLAGS = -no-undefined -module -release $(PKG_VER) -avoid-version @TCL_LIB_SPEC@
 hamlibtcl_la_LIBADD = $(top_builddir)/src/libhamlib.la
 
+hamlibtcl_ladir = $(tcldir)
+hamlibtcl_la_DATA = pkgIndex.tcl
+
 pkgIndex.tcl: Makefile
 	echo 'package ifneeded Hamlib $(PKG_VER) [list load [file join $$dir $(DLL)] Hamlib]' > pkgIndex.tcl
 
@@ -67,57 +72,45 @@ hamlibtcl_wrap.c: hamlib.swg $(SWGDEP)
 	$(SWIG) -tcl -pkgversion $(PKG_VER) @INCLUDES@ -I$(top_srcdir)/bindings -o $@ \
 		`test -f hamlib.swg || echo '$(srcdir)/'`hamlib.swg
 
-all-tcl: pkgIndex.tcl #$(DLL)
-
-
-tcldir      = $(TCL_EXEC_PREFIX)/lib/$(PACKAGE)
-libdir = $(tcldir)
-
-install-tcl: all-tcl
-#	if test ! -d $(tcldir); then mkdir $(tcldir); fi
-#	$(INSTALL_PROGRAM) $(DLL) $(tcldir)/$(DLL)
-#	$(INSTALL_DATA) pkgIndex.tcl $(tcldir)/pkgIndex.tcl
-#	$(INSTALL_DATA) $(MANN) $(MAN_INSTALL_DIR)/
+all-tcl: pkgIndex.tcl $(tcl_ltlib)
 
 check-tcl: all-tcl
 	TCLLIBPATH=$(builddir)/.libs $(srcdir)/tcltest.tcl || echo "Tcl test failed" 1>&2
 
+install-tcl: 
 clean-tcl:
-	rm -f pkgIndex.tcl $(DLL)
 distclean-tcl: clean-tcl
+uninstall-tcl: 
 
 ##########################################
 # Python binding
 
 python_ltlib = _Hamlib.la
 
+pythondir = $(prefix)/lib/python
+
 nodist__Hamlib_la_SOURCES = hamlibpy_wrap.c
 _Hamlib_la_LDFLAGS = -no-undefined -module -avoid-version
 _Hamlib_la_LIBADD = $(top_builddir)/src/libhamlib.la
 
+_Hamlib_ladir = $(pythondir)
+
+Hamlib.py: hamlibpy_wrap.c
 hamlibpy_wrap.c: hamlib.swg $(SWGDEP)
 	$(SWIG) -python @INCLUDES@ -I$(top_srcdir)/bindings -o $@ \
 		`test -f hamlib.swg || echo '$(srcdir)/'`hamlib.swg
 
-all-py: 
-
-
-pythondir      = $(prefix)/lib/$(PACKAGE)
-#libdir = $(pythondir)
-
-install-py: all-py
-#	if test ! -d $(pythondir); then mkdir $(pythondir); fi
-#	$(INSTALL_PROGRAM) $(DLL) $(pythondir)/$(DLL)
-#	$(INSTALL_DATA) $(MANN) $(MAN_INSTALL_DIR)/
+all-py: $(python_ltlib)
 
 check-py: all-py
-	$(srcdir)/pytest.py || echo "Tcl test failed" 1>&2
+	$(srcdir)/pytest.py || echo "Python test failed" 1>&2
 
+python_PYTHON = Hamlib.py
+
+install-py:
 clean-py:
-	rm -f pkgIndex.py $(DLL)
-distclean-py: clean-py
-
-
+distclean-py:
+uninstall-py: 
 
 ##########################################
 
@@ -130,7 +123,7 @@ clean-local: clean-perl clean-tcl clean-py
 distclean-local: distclean-perl distclean-tcl distclean-py
 distcheck-local: distcheck-perl
 install-exec-local: install-perl install-tcl install-py
-
+uninstall-local: uninstall-perl uninstall-tcl uninstall-py
 
 
 rig.swg: $(top_srcdir)/include/hamlib/rig.h $(top_srcdir)/include/hamlib/riglist.h