build: standard directory layout

Suitable for mature project.

root   - administrative stuff
doc    - documents
src    - sources
tests  - tests
distro - distro specific files
sample - samples

SIDE EFFECT: many changes to rpm spec.

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Acked-by: Adriaan de Jong <dejong@fox-it.com>
Signed-off-by: David Sommerseth <davids@redhat.com>

253 files changed, 339 insertions, 239 deletions

diff --git a/.gitignore b/.gitignore
index 8cc07de..46cd4c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,13 @@
 *.[oa]
 *.dll
 *.exe
+*.exe.*
 *.mak
 *.obj
 *.pyc
 *.so
 *~
+*.idb
 .deps
 Makefile
 Makefile.in
@@ -21,21 +23,11 @@ config.sub
 configure
 configure.h
 depcomp
-dist/
+stamp-h1
 install-sh
-install-win32/settings
-install-win32/tmp
 missing
-openvpn
-openvpn.8.html
-openvpn.exe.manifest
-openvpnserv.exe.manifest
-openvpn.spec
-stamp-h1
-t_client.sh
-tap-win32/SOURCES
-tap-win32/amd64/
-tap-win32/i386/
-tapinstall/
-vc90.idb
-win/version_m4_vars.tmp
+
+doc/openvpn.8.html
+distro/rpm/openvpn.spec
+tests/t_client.sh
+src/openvpn/openvpn
diff --git a/.svnignore b/.svnignore
deleted file mode 100644
index c02d2b8..0000000
--- a/.svnignore
+++ /dev/null
@@ -1,20 +0,0 @@
-*.o
-*.obj
-config.status
-config.log
-config.guess
-aclocal.m4
-install-sh
-Makefile.in
-openvpn
-depcomp
-config.h
-.deps
-Makefile
-config.h.in
-configure
-config.sub
-openvpn.spec
-stamp-h1
-autom4te.cache
-missing
diff --git a/Makefile.am b/Makefile.am
index a8ff457..850074b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,7 @@
 #
 #  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
 #  Copyright (C) 2010      David Sommerseth <dazo@users.sourceforge.net>
+#  Copyright (C) 2006-2012 Alon Bar-Lev <alon.barlev@gmail.com>
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License version 2
@@ -34,30 +35,13 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/config.h.in $(srcdir)/config.h.in~ $(srcdir)/configure \
 	$(srcdir)/install-sh $(srcdir)/ltmain.sh $(srcdir)/missing \
 	$(srcdir)/depcomp $(srcdir)/aclocal.m4 \
-	$(srcdir)/config.guess $(srcdir)/config.sub \
-	$(srcdir)/openvpn.spec
-CLEANFILES = openvpn.8.html
+	$(srcdir)/config.guess $(srcdir)/config.sub
 
 EXTRA_DIST = \
-	sample-config-files \
-	sample-keys \
-	sample-scripts \
-	suse \
 	contrib \
-	debug \
-	plugins
+	debug
 
-SUBDIRS = service-win32
-
-TESTS = t_client.sh t_lpback.sh t_cltsrv.sh
-sbin_PROGRAMS = openvpn
-
-dist_doc_DATA = \
-	management/management-notes.txt
-
-dist_noinst_SCRIPTS = \
-	$(TESTS) \
-	t_cltsrv-down.sh
+SUBDIRS = distro include src sample doc tests
 
 dist_doc_DATA = \
 	COPYRIGHT.GPL \
@@ -65,101 +49,12 @@ dist_doc_DATA = \
 
 dist_noinst_DATA = \
 	.gitignore \
-	openvpn.spec \
 	PORTS \
 	README.IPv6 TODO.IPv6 \
-	README.polarssl \
+	README.polarssl
 
 if WIN32
 dist_doc_DATA += INSTALL-win32.txt
 else
 dist_noinst_DATA += INSTALL-win32.txt
 endif
-
-openvpn_SOURCES = \
-        base64.c base64.h \
-	basic.h \
-	buffer.c buffer.h \
-	circ_list.h \
-	clinat.c clinat.h \
-	common.h \
-	compat.h compat.c \
-	crypto.c crypto.h crypto_backend.h \
-	crypto_openssl.c crypto_openssl.h \
-	crypto_polarssl.c crypto_polarssl.h \
-	dhcp.c dhcp.h \
-	errlevel.h \
-	error.c error.h \
-	event.c event.h \
-	fdmisc.c fdmisc.h \
-        forward.c forward.h forward-inline.h \
-	fragment.c fragment.h \
-	gremlin.c gremlin.h \
-	helper.c helper.h \
-	httpdigest.c httpdigest.h \
-	lladdr.c lladdr.h \
-	init.c init.h \
-	integer.h \
-        interval.c interval.h \
-	list.c list.h \
-	lzo.c lzo.h \
-	manage.c manage.h \
-	mbuf.c mbuf.h \
-        memdbg.h \
-	misc.c misc.h \
-	mroute.c mroute.h \
-	mss.c mss.h \
-	mstats.c mstats.h \
-	mtcp.c mtcp.h \
-	mtu.c mtu.h \
-	mudp.c mudp.h \
-	multi.c multi.h \
-        ntlm.c ntlm.h \
-	occ.c occ.h occ-inline.h \
-	pkcs11.c pkcs11.h pkcs11_backend.h \
-	pkcs11_openssl.c \
-	pkcs11_polarssl.c \
-	openvpn.c openvpn.h \
-	openvpn-plugin.h \
-	options.c options.h \
-	otime.c otime.h \
-	packet_id.c packet_id.h \
-	perf.c perf.h \
-	pf.c pf.h pf-inline.h \
-	ping.c ping.h ping-inline.h \
-	plugin.c plugin.h \
-	pool.c pool.h \
-	proto.c proto.h \
-	proxy.c proxy.h \
-        ps.c ps.h \
-	push.c push.h \
-	pushlist.h \
-	reliable.c reliable.h \
-	route.c route.h \
-	schedule.c schedule.h \
-	session_id.c session_id.h \
-	shaper.c shaper.h \
-	sig.c sig.h \
-	socket.c socket.h \
-	socks.c socks.h \
-	ssl.c ssl.h  ssl_backend.h \
-	ssl_openssl.c ssl_openssl.h \
-	ssl_polarssl.c ssl_polarssl.h \
-	ssl_common.h \
-	ssl_verify.c ssl_verify.h ssl_verify_backend.h \
-	ssl_verify_openssl.c ssl_verify_openssl.h \
-	ssl_verify_polarssl.c ssl_verify_polarssl.h \
-	status.c status.h \
-	syshead.h \
-	tun.c tun.h tap-windows.h \
-	win32.h win32.c \
-	cryptoapi.h cryptoapi.c
-
-if WIN32
-dist_noinst_DATA += openvpn.8
-nodist_html_DATA = openvpn.8.html
-openvpn.8.html: $(srcdir)/openvpn.8
-	$(MAN2HTML) < $(srcdir)/openvpn.8 > openvpn.8.html
-else
-dist_man_MANS = openvpn.8
-endif
diff --git a/configure.ac b/configure.ac
index 0b70325..fe0fbab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_INIT([PRODUCT_NAME], [PRODUCT_VERSION], [PRODUCT_BUGREPORT], [PRODUCT_TARNAME
 m4_include(compat.m4)
 AC_CONFIG_AUX_DIR([.])
 AM_CONFIG_HEADER([config.h])
-AC_CONFIG_SRCDIR([syshead.h])
+AC_CONFIG_SRCDIR([src/openvpn/syshead.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
 AC_CANONICAL_HOST
@@ -928,10 +928,18 @@ AC_SUBST([TAP_WIN_MIN_MINOR])
 
 AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])
 
-AC_CONFIG_FILES([t_client.sh], [chmod +x t_client.sh])
 AC_CONFIG_FILES([
 	Makefile
-	openvpn.spec
-	service-win32/Makefile
+	distro/Makefile
+	distro/rpm/Makefile
+	distro/rpm/openvpn.spec
+	include/Makefile
+	src/Makefile
+	src/openvpn/Makefile
+	src/openvpnserv/Makefile
+	tests/Makefile
+	sample/Makefile
+	doc/Makefile
 ])
+AC_CONFIG_FILES([tests/t_client.sh], [chmod +x tests/t_client.sh])
 AC_OUTPUT
diff --git a/doval b/debug/doval
index e215510..e215510 100755
--- a/doval
+++ b/debug/doval
diff --git a/dovalns b/debug/dovalns
index 482ae3f..482ae3f 100755
--- a/dovalns
+++ b/debug/dovalns
diff --git a/distro/Makefile.am b/distro/Makefile.am
new file mode 100644
index 0000000..2dd6a6e
--- /dev/null
+++ b/distro/Makefile.am
@@ -0,0 +1,15 @@
+#
+#  OpenVPN -- An application to securely tunnel IP networks
+#             over a single UDP port, with support for SSL/TLS-based
+#             session authentication and key exchange,
+#             packet encryption, packet authentication, and
+#             packet compression.
+#
+#  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
+#  Copyright (C) 2006-2012 Alon Bar-Lev <alon.barlev@gmail.com>
+#
+
+MAINTAINERCLEANFILES = \
+	$(srcdir)/Makefile.in
+
+SUBDIRS = rpm
diff --git a/distro/rpm/Makefile.am b/distro/rpm/Makefile.am
new file mode 100644
index 0000000..536061d
--- /dev/null
+++ b/distro/rpm/Makefile.am
@@ -0,0 +1,18 @@
+#
+#  OpenVPN -- An application to securely tunnel IP networks
+#             over a single UDP port, with support for SSL/TLS-based
+#             session authentication and key exchange,
+#             packet encryption, packet authentication, and
+#             packet compression.
+#
+#  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
+#  Copyright (C) 2006-2012 Alon Bar-Lev <alon.barlev@gmail.com>
+#
+
+MAINTAINERCLEANFILES = \
+	$(srcdir)/Makefile.in
+
+dist_noinst_DATA = \
+	openvpn.spec \
+	openvpn.init.d.rhel \
+	openvpn.init.d.suse
diff --git a/sample-scripts/openvpn.init b/distro/rpm/openvpn.init.d.rhel
index 821abd5..821abd5 100755
--- a/sample-scripts/openvpn.init
+++ b/distro/rpm/openvpn.init.d.rhel
diff --git a/suse/openvpn.init b/distro/rpm/openvpn.init.d.suse
index 8f1060a..2bac7f3 100644
--- a/suse/openvpn.init
+++ b/distro/rpm/openvpn.init.d.suse
@@ -82,7 +82,7 @@
 #
 
 # Location of openvpn binary
-openvpn="/usr/local/sbin/openvpn"
+openvpn="/usr/sbin/openvpn"
 
 # Lockfile
 lock="/var/lock/subsys/openvpn"
diff --git a/openvpn.spec.in b/distro/rpm/openvpn.spec.in
index 6283d62..455f739 100644
--- a/openvpn.spec.in
+++ b/distro/rpm/openvpn.spec.in
@@ -68,6 +68,13 @@ support for dynamic IP addresses and DHCP,
 scalability to hundreds or thousands of users,
 and portability to most major OS platforms.
 
+%package devel
+Summary:	OpenVPN is a robust and highly flexible VPN daemon by James Yonan.
+Group:		Applications/Internet
+Requires:      %{name}
+%description devel
+Development support for OpenVPN.
+
 #
 # Define vendor type
 #
@@ -99,17 +106,22 @@ and portability to most major OS platforms.
 %setup -q
 
 %build
-%configure --disable-dependency-tracking %{?with_password_save:--enable-password-save} %{?without_lzo:--disable-lzo} %{?with_kerberos:--with-ssl-headers=/usr/kerberos/include}
+%configure \
+	--disable-dependency-tracking \
+	--docdir="%{_docdir}/%{name}-%{version}" \
+	%{?with_password_save:--enable-password-save} \
+	%{?without_lzo:--disable-lzo} \
+	%{?with_kerberos:--with-ssl-headers=/usr/kerberos/include}
 %__make
 
 # Build down-root plugin
-pushd plugins/down-root
+pushd src/plugins/down-root
 %__make
 popd
 
 # Build auth-pam plugin
 %if %{build_auth_pam}
-pushd plugins/auth-pam
+pushd src/plugins/auth-pam
 %__make
 popd
 %endif
@@ -124,17 +136,15 @@ popd
 
 # Install init script
 %if "%{VENDOR}" == "SuSE"
-%__install -c -d -m 755 %{buildroot}/etc/init.d
-%__sed -e 's#openvpn=\"/usr/local/sbin/openvpn\"#openvpn=\"/usr/sbin/openvpn\"#' < suse/%{name}.init > %{_tmppath}/%{name}.init
-%__install -c -m 755 %{_tmppath}/%{name}.init %{buildroot}/etc/init.d/%{name}
-%__rm %{_tmppath}/%{name}.init 
+%__install -c -d -m 755 "%{buildroot}/etc/init.d"
+%__install -c -m 755 "distro/rpm/%{name}.init.d.suse"  "%{buildroot}/etc/init.d/%{name}"
 %else
-%__install -c -d -m 755 %{buildroot}/etc/rc.d/init.d
-%__install -c -m 755 sample-scripts/%{name}.init %{buildroot}/etc/rc.d/init.d/%{name}
+%__install -c -d -m 755 "%{buildroot}/etc/rc.d/init.d"
+%__install -c -m 755 distro/rpm/%{name}.init.d.rhel  "%{buildroot}/etc/rc.d/init.d/%{name}"
 %endif
 
 # Install /etc/openvpn
-%__install -c -d -m 755 %{buildroot}/etc/%{name}
+%__install -c -d -m 755 "%{buildroot}/etc/%{name}"
 
 #
 # Build /usr/share/openvpn
@@ -146,23 +156,23 @@ popd
 # Install the plugins
 #
 
-%__mkdir_p %{buildroot}%{_datadir}/%{name}/plugins/lib
+%__mkdir_p "%{buildroot}%{_datadir}/%{name}/plugins/lib"
 
 for pi in auth-pam down-root; do
-  %__mv -f plugins/$pi/README plugins/README.$pi
-  if [ -e plugins/$pi/openvpn-$pi.so ]; then
-    %__install -c -m 755 plugins/$pi/openvpn-$pi.so %{buildroot}%{_datadir}/openvpn/plugins/lib/openvpn-$pi.so
+  %__mv -f src/plugins/$pi/README src/plugins/README.$pi
+  if [ -e src/plugins/$pi/openvpn-$pi.so ]; then
+    %__install -c -m 755 src/plugins/$pi/openvpn-$pi.so "%{buildroot}%{_datadir}/openvpn/plugins/lib/openvpn-$pi.so"
   fi
 done
 
-%__mv -f plugins/README plugins/README.plugins
+%__mv -f src/plugins/README src/plugins/README.plugins
 
 #
 # Clean section
 #
 
 %clean
-[ %{buildroot} != "/" ] && rm -rf %{buildroot}
+[ %{buildroot} != "/" ] && rm -rf "%{buildroot}"
 
 #
 # On Linux 2.4, make the device node
@@ -215,7 +225,11 @@ fi
 %endif
 
 # Install extra %doc stuff
-%doc contrib/ sample-*/ plugins/README.*
+%doc contrib/ sample/ src/plugins/README.*
+
+%files devel
+%defattr(-,root,root)
+%{_includedir}/*
 
 %changelog
 * Thu Jul 30 2009 David Sommerseth <dazo@users.sourceforge.net>
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..46687b2
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,28 @@
+#
+#  OpenVPN -- An application to securely tunnel IP networks
+#             over a single UDP port, with support for SSL/TLS-based
+#             session authentication and key exchange,
+#             packet encryption, packet authentication, and
+#             packet compression.
+#
+#  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
+#  Copyright (C) 2006-2012 Alon Bar-Lev <alon.barlev@gmail.com>
+#
+
+MAINTAINERCLEANFILES = \
+	$(srcdir)/Makefile.in
+
+CLEANFILES = openvpn.8.html
+
+dist_doc_DATA = \
+	management-notes.txt
+
+if WIN32
+dist_noinst_DATA = openvpn.8
+nodist_html_DATA = openvpn.8.html
+openvpn.8.html: $(srcdir)/openvpn.8
+	$(MAN2HTML) < $(srcdir)/openvpn.8 > openvpn.8.html
+else
+dist_man_MANS = openvpn.8
+endif
+
diff --git a/doxygen/doc_compression.h b/doc/doxygen/doc_compression.h
index c28c0b6..c28c0b6 100644
--- a/doxygen/doc_compression.h
+++ b/doc/doxygen/doc_compression.h
diff --git a/doxygen/doc_control_processor.h b/doc/doxygen/doc_control_processor.h
index 072dc37..072dc37 100644
--- a/doxygen/doc_control_processor.h
+++ b/doc/doxygen/doc_control_processor.h
diff --git a/doxygen/doc_control_tls.h b/doc/doxygen/doc_control_tls.h
index aba55f7..aba55f7 100644
--- a/doxygen/doc_control_tls.h
+++ b/doc/doxygen/doc_control_tls.h
diff --git a/doxygen/doc_data_control.h b/doc/doxygen/doc_data_control.h
index d0f65ba..d0f65ba 100644
--- a/doxygen/doc_data_control.h
+++ b/doc/doxygen/doc_data_control.h
diff --git a/doxygen/doc_data_crypto.h b/doc/doxygen/doc_data_crypto.h
index 50437c1..50437c1 100644
--- a/doxygen/doc_data_crypto.h
+++ b/doc/doxygen/doc_data_crypto.h
diff --git a/doxygen/doc_eventloop.h b/doc/doxygen/doc_eventloop.h
index a860db6..a860db6 100644
--- a/doxygen/doc_eventloop.h
+++ b/doc/doxygen/doc_eventloop.h
diff --git a/doxygen/doc_external_multiplexer.h b/doc/doxygen/doc_external_multiplexer.h
index 7653255..7653255 100644
--- a/doxygen/doc_external_multiplexer.h
+++ b/doc/doxygen/doc_external_multiplexer.h
diff --git a/doxygen/doc_fragmentation.h b/doc/doxygen/doc_fragmentation.h
index ef34cdb..ef34cdb 100644
--- a/doxygen/doc_fragmentation.h
+++ b/doc/doxygen/doc_fragmentation.h
diff --git a/doxygen/doc_internal_multiplexer.h b/doc/doxygen/doc_internal_multiplexer.h
index 5142dd0..5142dd0 100644
--- a/doxygen/doc_internal_multiplexer.h
+++ b/doc/doxygen/doc_internal_multiplexer.h
diff --git a/doxygen/doc_key_generation.h b/doc/doxygen/doc_key_generation.h
index 903a465..903a465 100644
--- a/doxygen/doc_key_generation.h
+++ b/doc/doxygen/doc_key_generation.h
diff --git a/doxygen/doc_mainpage.h b/doc/doxygen/doc_mainpage.h
index 821b2e8..821b2e8 100644
--- a/doxygen/doc_mainpage.h
+++ b/doc/doxygen/doc_mainpage.h
diff --git a/doxygen/doc_memory_management.h b/doc/doxygen/doc_memory_management.h
index f948783..f948783 100644
--- a/doxygen/doc_memory_management.h
+++ b/doc/doxygen/doc_memory_management.h
diff --git a/doxygen/doc_protocol_overview.h b/doc/doxygen/doc_protocol_overview.h
index 26fed33..26fed33 100644
--- a/doxygen/doc_protocol_overview.h
+++ b/doc/doxygen/doc_protocol_overview.h
diff --git a/doxygen/doc_reliable.h b/doc/doxygen/doc_reliable.h
index 5264906..5264906 100644
--- a/doxygen/doc_reliable.h
+++ b/doc/doxygen/doc_reliable.h
diff --git a/doxygen/doc_tunnel_state.h b/doc/doxygen/doc_tunnel_state.h
index 6c93e71..6c93e71 100644
--- a/doxygen/doc_tunnel_state.h
+++ b/doc/doxygen/doc_tunnel_state.h
diff --git a/doxygen/openvpn.doxyfile b/doc/doxygen/openvpn.doxyfile
index 5d87172..5d87172 100644
--- a/doxygen/openvpn.doxyfile
+++ b/doc/doxygen/openvpn.doxyfile
diff --git a/management/management-notes.txt b/doc/management-notes.txt
index 785eb88..785eb88 100644
--- a/management/management-notes.txt
+++ b/doc/management-notes.txt
diff --git a/openvpn.8 b/doc/openvpn.8
index 53d6bdb..53d6bdb 100644
--- a/openvpn.8
+++ b/doc/openvpn.8
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 0000000..36eeb6c
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,17 @@
+#
+#  OpenVPN -- An application to securely tunnel IP networks
+#             over a single UDP port, with support for SSL/TLS-based
+#             session authentication and key exchange,
+#             packet encryption, packet authentication, and
+#             packet compression.
+#
+#  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
+#  Copyright (C) 2006-2012 Alon Bar-Lev <alon.barlev@gmail.com>
+#
+
+MAINTAINERCLEANFILES = \
+	$(srcdir)/Makefile.in
+
+dist_noinst_HEADERS = tap-windows.h
+
+include_HEADERS = openvpn-plugin.h
diff --git a/openvpn-plugin.h b/include/openvpn-plugin.h
index de54a5a..de54a5a 100644
--- a/openvpn-plugin.h
+++ b/include/openvpn-plugin.h
diff --git a/tap-windows.h b/include/tap-windows.h
index 243a4a2..243a4a2 100644
--- a/tap-windows.h
+++ b/include/tap-windows.h
diff --git a/plugins/auth-pam/.svnignore b/plugins/auth-pam/.svnignore
deleted file mode 100644
index 140f8cf..0000000
--- a/plugins/auth-pam/.svnignore
+++ /dev/null
@@ -1 +0,0 @@
-*.so
diff --git a/sample/Makefile.am b/sample/Makefile.am
new file mode 100644
index 0000000..5df8d9c
--- /dev/null
+++ b/sample/Makefile.am
@@ -0,0 +1,19 @@
+#
+#  OpenVPN -- An application to securely tunnel IP networks
+#             over a single UDP port, with support for SSL/TLS-based
+#             session authentication and key exchange,
+#             packet encryption, packet authentication, and
+#             packet compression.
+#
+#  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
+#  Copyright (C) 2006-2012 Alon Bar-Lev <alon.barlev@gmail.com>
+#
+
+MAINTAINERCLEANFILES = \
+	$(srcdir)/Makefile.in
+
+EXTRA_DIST = \
+	sample-config-files \
+	sample-windows \
+	sample-keys \
+	sample-scripts
diff --git a/sample-config-files/README b/sample/sample-config-files/README
index d53ac79..d53ac79 100644
--- a/sample-config-files/README
+++ b/sample/sample-config-files/README
diff --git a/sample-config-files/client.conf b/sample/sample-config-files/client.conf
index 58b2038..58b2038 100644
--- a/sample-config-files/client.conf
+++ b/sample/sample-config-files/client.conf
diff --git a/sample-config-files/firewall.sh b/sample/sample-config-files/firewall.sh
index 19d75ee..19d75ee 100755
--- a/sample-config-files/firewall.sh
+++ b/sample/sample-config-files/firewall.sh
diff --git a/sample-config-files/home.up b/sample/sample-config-files/home.up
index 9c347cc..9c347cc 100755
--- a/sample-config-files/home.up
+++ b/sample/sample-config-files/home.up
diff --git a/sample-config-files/loopback-client b/sample/sample-config-files/loopback-client
index d7f59e6..d7f59e6 100644
--- a/sample-config-files/loopback-client
+++ b/sample/sample-config-files/loopback-client
diff --git a/sample-config-files/loopback-server b/sample/sample-config-files/loopback-server
index 9d21bce..9d21bce 100644
--- a/sample-config-files/loopback-server
+++ b/sample/sample-config-files/loopback-server
diff --git a/sample-config-files/office.up b/sample/sample-config-files/office.up
index 74a71a3..74a71a3 100755
--- a/sample-config-files/office.up
+++ b/sample/sample-config-files/office.up
diff --git a/sample-config-files/openvpn-shutdown.sh b/sample/sample-config-files/openvpn-shutdown.sh
index 8ed2d1d..8ed2d1d 100755
--- a/sample-config-files/openvpn-shutdown.sh
+++ b/sample/sample-config-files/openvpn-shutdown.sh
diff --git a/sample-config-files/openvpn-startup.sh b/sample/sample-config-files/openvpn-startup.sh
index 0ee006b..0ee006b 100755
--- a/sample-config-files/openvpn-startup.sh
+++ b/sample/sample-config-files/openvpn-startup.sh
diff --git a/sample-config-files/server.conf b/sample/sample-config-files/server.conf
index f483b6b..f483b6b 100644
--- a/sample-config-files/server.conf
+++ b/sample/sample-config-files/server.conf
diff --git a/sample-config-files/static-home.conf b/sample/sample-config-files/static-home.conf
index c966687..c966687 100644
--- a/sample-config-files/static-home.conf
+++ b/sample/sample-config-files/static-home.conf
diff --git a/sample-config-files/static-office.conf b/sample/sample-config-files/static-office.conf
index 68030cc..68030cc 100644
--- a/sample-config-files/static-office.conf
+++ b/sample/sample-config-files/static-office.conf
diff --git a/sample-config-files/tls-home.conf b/sample/sample-config-files/tls-home.conf
index daa4ea1..daa4ea1 100644
--- a/sample-config-files/tls-home.conf
+++ b/sample/sample-config-files/tls-home.conf
diff --git a/sample-config-files/tls-office.conf b/sample/sample-config-files/tls-office.conf
index f790f46..f790f46 100644
--- a/sample-config-files/tls-office.conf
+++ b/sample/sample-config-files/tls-office.conf
diff --git a/sample-config-files/xinetd-client-config b/sample/sample-config-files/xinetd-client-config
index 03c5c1f..03c5c1f 100644
--- a/sample-config-files/xinetd-client-config
+++ b/sample/sample-config-files/xinetd-client-config
diff --git a/sample-config-files/xinetd-server-config b/sample/sample-config-files/xinetd-server-config
index 803a6f8..803a6f8 100644
--- a/sample-config-files/xinetd-server-config
+++ b/sample/sample-config-files/xinetd-server-config
diff --git a/sample-keys/README b/sample/sample-keys/README
index 1cd473a..1cd473a 100644
--- a/sample-keys/README
+++ b/sample/sample-keys/README
diff --git a/sample-keys/ca.crt b/sample/sample-keys/ca.crt
index e063ccc..e063ccc 100644
--- a/sample-keys/ca.crt
+++ b/sample/sample-keys/ca.crt
diff --git a/sample-keys/ca.key b/sample/sample-keys/ca.key
index b4bf792..b4bf792 100644
--- a/sample-keys/ca.key
+++ b/sample/sample-keys/ca.key
diff --git a/sample-keys/client.crt b/sample/sample-keys/client.crt
index c047446..c047446 100644
--- a/sample-keys/client.crt
+++ b/sample/sample-keys/client.crt
diff --git a/sample-keys/client.key b/sample/sample-keys/client.key
index 17b9509..17b9509 100644
--- a/sample-keys/client.key
+++ b/sample/sample-keys/client.key
diff --git a/sample-keys/dh1024.pem b/sample/sample-keys/dh1024.pem
index 7ce05f0..7ce05f0 100644
--- a/sample-keys/dh1024.pem
+++ b/sample/sample-keys/dh1024.pem
diff --git a/sample-keys/pass.crt b/sample/sample-keys/pass.crt
index 8bb7b17..8bb7b17 100644
--- a/sample-keys/pass.crt
+++ b/sample/sample-keys/pass.crt
diff --git a/sample-keys/pass.key b/sample/sample-keys/pass.key
index 4916364..4916364 100644
--- a/sample-keys/pass.key
+++ b/sample/sample-keys/pass.key
diff --git a/sample-keys/pkcs12.p12 b/sample/sample-keys/pkcs12.p12
index 253d408..253d408 100644
--- a/sample-keys/pkcs12.p12
+++ b/sample/sample-keys/pkcs12.p12
diff --git a/sample-keys/server.crt b/sample/sample-keys/server.crt
index 28bb4d9..28bb4d9 100644
--- a/sample-keys/server.crt
+++ b/sample/sample-keys/server.crt
diff --git a/sample-keys/server.key b/sample/sample-keys/server.key
index 976acab..976acab 100644
--- a/sample-keys/server.key
+++ b/sample/sample-keys/server.key
diff --git a/sample-scripts/auth-pam.pl b/sample/sample-scripts/auth-pam.pl
index 5333bad..5333bad 100755
--- a/sample-scripts/auth-pam.pl
+++ b/sample/sample-scripts/auth-pam.pl
diff --git a/sample-scripts/bridge-start b/sample/sample-scripts/bridge-start
index d20a260..d20a260 100755
--- a/sample-scripts/bridge-start
+++ b/sample/sample-scripts/bridge-start
diff --git a/sample-scripts/bridge-stop b/sample/sample-scripts/bridge-stop
index 8192779..8192779 100755
--- a/sample-scripts/bridge-stop
+++ b/sample/sample-scripts/bridge-stop
diff --git a/sample-scripts/ucn.pl b/sample/sample-scripts/ucn.pl
index 6d708f8..6d708f8 100755
--- a/sample-scripts/ucn.pl
+++ b/sample/sample-scripts/ucn.pl
diff --git a/sample-scripts/verify-cn b/sample/sample-scripts/verify-cn
index 6e747ef..6e747ef 100755
--- a/sample-scripts/verify-cn
+++ b/sample/sample-scripts/verify-cn
diff --git a/sample-windows/sample.ovpn b/sample/sample-windows/sample.ovpn
index 5accd57..5accd57 100755
--- a/sample-windows/sample.ovpn
+++ b/sample/sample-windows/sample.ovpn
diff --git a/service-win32/.svnignore b/service-win32/.svnignore
deleted file mode 100644
index d9987b3..0000000
--- a/service-win32/.svnignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.o
-Makefile.in
-.deps
-Makefile
diff --git a/service-win32/Makefile.am b/service-win32/Makefile.am
deleted file mode 100644
index 4e4f55e..0000000
--- a/service-win32/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-#  OpenVPN -- An application to securely tunnel IP networks
-#             over a single UDP port, with support for SSL/TLS-based
-#             session authentication and key exchange,
-#             packet encryption, packet authentication, and
-#             packet compression.
-#
-#  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License version 2
-#  as published by the Free Software Foundation.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program (see the file COPYING included with this
-#  distribution); if not, write to the Free Software Foundation, Inc.,
-#  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-
-if WIN32
-
-sbin_PROGRAMS = openvpnserv
-
-openvpnserv_SOURCES = \
-	openvpnserv.c \
-	service.h service.c
-
-else
-
-dist_noinst_DATA = \
-	openvpnserv.c \
-	service.h service.c
-
-endif
diff --git a/sources b/sources
deleted file mode 100755
index dbfa018..0000000
--- a/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-ls -1 *.[ch]
-ls -1 configure.ac Makefile.am
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..f2481c2
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,18 @@
+#
+#  OpenVPN -- An application to securely tunnel IP networks
+#             over a single UDP port, with support for SSL/TLS-based
+#             session authentication and key exchange,
+#             packet encryption, packet authentication, and
+#             packet compression.
+#
+#  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
+#  Copyright (C) 2006-2012 Alon Bar-Lev <alon.barlev@gmail.com>
+#
+
+MAINTAINERCLEANFILES = \
+	$(srcdir)/Makefile.in
+
+EXTRA_DIST = \
+	plugins
+
+SUBDIRS = openvpn openvpnserv
diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am
new file mode 100644
index 0000000..4a6b497
--- /dev/null
+++ b/src/openvpn/Makefile.am
@@ -0,0 +1,95 @@
+#
+#  OpenVPN -- An application to securely tunnel IP networks
+#             over a single UDP port, with support for SSL/TLS-based
+#             session authentication and key exchange,
+#             packet encryption, packet authentication, and
+#             packet compression.
+#
+#  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
+#  Copyright (C) 2006-2012 Alon Bar-Lev <alon.barlev@gmail.com>
+#
+
+MAINTAINERCLEANFILES = \
+	$(srcdir)/Makefile.in
+
+INCLUDES = -I$(top_srcdir)/include
+
+sbin_PROGRAMS = openvpn
+
+openvpn_SOURCES = \
+	base64.c base64.h \
+	basic.h \
+	buffer.c buffer.h \
+	circ_list.h \
+	clinat.c clinat.h \
+	common.h \
+	compat.h compat.c \
+	crypto.c crypto.h crypto_backend.h \
+	crypto_openssl.c crypto_openssl.h \
+	crypto_polarssl.c crypto_polarssl.h \
+	dhcp.c dhcp.h \
+	errlevel.h \
+	error.c error.h \
+	event.c event.h \
+	fdmisc.c fdmisc.h \
+	forward.c forward.h forward-inline.h \
+	fragment.c fragment.h \
+	gremlin.c gremlin.h \
+	helper.c helper.h \
+	httpdigest.c httpdigest.h \
+	lladdr.c lladdr.h \
+	init.c init.h \
+	integer.h \
+	interval.c interval.h \
+	list.c list.h \
+	lzo.c lzo.h \
+	manage.c manage.h \
+	mbuf.c mbuf.h \
+	memdbg.h \
+	misc.c misc.h \
+	mroute.c mroute.h \
+	mss.c mss.h \
+	mstats.c mstats.h \
+	mtcp.c mtcp.h \
+	mtu.c mtu.h \
+	mudp.c mudp.h \
+	multi.c multi.h \
+	ntlm.c ntlm.h \
+	occ.c occ.h occ-inline.h \
+	pkcs11.c pkcs11.h pkcs11_backend.h \
+	pkcs11_openssl.c \
+	pkcs11_polarssl.c \
+	openvpn.c openvpn.h \
+	options.c options.h \
+	otime.c otime.h \
+	packet_id.c packet_id.h \
+	perf.c perf.h \
+	pf.c pf.h pf-inline.h \
+	ping.c ping.h ping-inline.h \
+	plugin.c plugin.h \
+	pool.c pool.h \
+	proto.c proto.h \
+	proxy.c proxy.h \
+	ps.c ps.h \
+	push.c push.h \
+	pushlist.h \
+	reliable.c reliable.h \
+	route.c route.h \
+	schedule.c schedule.h \
+	session_id.c session_id.h \
+	shaper.c shaper.h \
+	sig.c sig.h \
+	socket.c socket.h \
+	socks.c socks.h \
+	ssl.c ssl.h  ssl_backend.h \
+	ssl_openssl.c ssl_openssl.h \
+	ssl_polarssl.c ssl_polarssl.h \
+	ssl_common.h \
+	ssl_verify.c ssl_verify.h ssl_verify_backend.h \
+	ssl_verify_openssl.c ssl_verify_openssl.h \
+	ssl_verify_polarssl.c ssl_verify_polarssl.h \
+	status.c status.h \
+	syshead.h \
+	tun.c tun.h \
+	win32.h win32.c \
+	cryptoapi.h cryptoapi.c
diff --git a/base64.c b/src/openvpn/base64.c
index 303d773..303d773 100644
--- a/base64.c
+++ b/src/openvpn/base64.c
diff --git a/base64.h b/src/openvpn/base64.h
index 28a9677..28a9677 100644
--- a/base64.h
+++ b/src/openvpn/base64.h
diff --git a/basic.h b/src/openvpn/basic.h
index 88539e2..88539e2 100644
--- a/basic.h
+++ b/src/openvpn/basic.h
diff --git a/buffer.c b/src/openvpn/buffer.c
index 391085b..391085b 100644
--- a/buffer.c
+++ b/src/openvpn/buffer.c
diff --git a/buffer.h b/src/openvpn/buffer.h
index 9bc33db..9bc33db 100644
--- a/buffer.h
+++ b/src/openvpn/buffer.h
diff --git a/circ_list.h b/src/openvpn/circ_list.h
index 583701a..583701a 100644
--- a/circ_list.h
+++ b/src/openvpn/circ_list.h
diff --git a/clinat.c b/src/openvpn/clinat.c
index 8e85e22..8e85e22 100644
--- a/clinat.c
+++ b/src/openvpn/clinat.c
diff --git a/clinat.h b/src/openvpn/clinat.h
index d55a727..d55a727 100644
--- a/clinat.h
+++ b/src/openvpn/clinat.h
diff --git a/common.h b/src/openvpn/common.h
index de2d609..de2d609 100644
--- a/common.h
+++ b/src/openvpn/common.h
diff --git a/compat.c b/src/openvpn/compat.c
index 2b1098e..2b1098e 100644
--- a/compat.c
+++ b/src/openvpn/compat.c
diff --git a/compat.h b/src/openvpn/compat.h
index b380f0b..b380f0b 100644
--- a/compat.h
+++ b/src/openvpn/compat.h
diff --git a/crypto.c b/src/openvpn/crypto.c
index 5af92a0..5af92a0 100644
--- a/crypto.c
+++ b/src/openvpn/crypto.c
diff --git a/crypto.h b/src/openvpn/crypto.h
index 293f984..293f984 100644
--- a/crypto.h
+++ b/src/openvpn/crypto.h
diff --git a/crypto_backend.h b/src/openvpn/crypto_backend.h
index a0966dd..a0966dd 100644
--- a/crypto_backend.h
+++ b/src/openvpn/crypto_backend.h
diff --git a/crypto_openssl.c b/src/openvpn/crypto_openssl.c
index e5e1122..e5e1122 100644
--- a/crypto_openssl.c
+++ b/src/openvpn/crypto_openssl.c
diff --git a/crypto_openssl.h b/src/openvpn/crypto_openssl.h
index f883c2a..f883c2a 100644
--- a/crypto_openssl.h
+++ b/src/openvpn/crypto_openssl.h
diff --git a/crypto_polarssl.c b/src/openvpn/crypto_polarssl.c
index ac4cadd..ac4cadd 100644
--- a/crypto_polarssl.c
+++ b/src/openvpn/crypto_polarssl.c
diff --git a/crypto_polarssl.h b/src/openvpn/crypto_polarssl.h
index 358483a..358483a 100644
--- a/crypto_polarssl.h
+++ b/src/openvpn/crypto_polarssl.h
diff --git a/cryptoapi.c b/src/openvpn/cryptoapi.c
index fed91c5..fed91c5 100644
--- a/cryptoapi.c
+++ b/src/openvpn/cryptoapi.c
diff --git a/cryptoapi.h b/src/openvpn/cryptoapi.h
index 8ac6db3..8ac6db3 100644
--- a/cryptoapi.h
+++ b/src/openvpn/cryptoapi.h
diff --git a/dhcp.c b/src/openvpn/dhcp.c
index 280a4af..280a4af 100644
--- a/dhcp.c
+++ b/src/openvpn/dhcp.c
diff --git a/dhcp.h b/src/openvpn/dhcp.h
index e823a4a..e823a4a 100644
--- a/dhcp.h
+++ b/src/openvpn/dhcp.h
diff --git a/errlevel.h b/src/openvpn/errlevel.h
index 3ee4ebc..3ee4ebc 100644
--- a/errlevel.h
+++ b/src/openvpn/errlevel.h
diff --git a/error.c b/src/openvpn/error.c
index 34c4184..34c4184 100644
--- a/error.c
+++ b/src/openvpn/error.c
diff --git a/error.h b/src/openvpn/error.h
index d2c04b0..d2c04b0 100644
--- a/error.h
+++ b/src/openvpn/error.h
diff --git a/event.c b/src/openvpn/event.c
index b6ed673..b6ed673 100644
--- a/event.c
+++ b/src/openvpn/event.c
diff --git a/event.h b/src/openvpn/event.h
index bd29fdc..bd29fdc 100644
--- a/event.h
+++ b/src/openvpn/event.h
diff --git a/fdmisc.c b/src/openvpn/fdmisc.c
index 5be3c8b..5be3c8b 100644
--- a/fdmisc.c
+++ b/src/openvpn/fdmisc.c
diff --git a/fdmisc.h b/src/openvpn/fdmisc.h
index 4b6b6d0..4b6b6d0 100644
--- a/fdmisc.h
+++ b/src/openvpn/fdmisc.h
diff --git a/forward-inline.h b/src/openvpn/forward-inline.h
index 64ca941..64ca941 100644
--- a/forward-inline.h
+++ b/src/openvpn/forward-inline.h
diff --git a/forward.c b/src/openvpn/forward.c
index ace7d2a..ace7d2a 100644
--- a/forward.c
+++ b/src/openvpn/forward.c
diff --git a/forward.h b/src/openvpn/forward.h
index 0f829bd..0f829bd 100644
--- a/forward.h
+++ b/src/openvpn/forward.h
diff --git a/fragment.c b/src/openvpn/fragment.c
index 5ef3a47..5ef3a47 100644
--- a/fragment.c
+++ b/src/openvpn/fragment.c
diff --git a/fragment.h b/src/openvpn/fragment.h
index 866573b..866573b 100644
--- a/fragment.h
+++ b/src/openvpn/fragment.h
diff --git a/gremlin.c b/src/openvpn/gremlin.c
index c7c0206..c7c0206 100644
--- a/gremlin.c
+++ b/src/openvpn/gremlin.c
diff --git a/gremlin.h b/src/openvpn/gremlin.h
index c0aeab1..c0aeab1 100644
--- a/gremlin.h
+++ b/src/openvpn/gremlin.h
diff --git a/helper.c b/src/openvpn/helper.c
index 22ea652..22ea652 100644
--- a/helper.c
+++ b/src/openvpn/helper.c
diff --git a/helper.h b/src/openvpn/helper.h
index 444969c..444969c 100644
--- a/helper.h
+++ b/src/openvpn/helper.h
diff --git a/httpdigest.c b/src/openvpn/httpdigest.c
index 1aa19ae..1aa19ae 100644
--- a/httpdigest.c
+++ b/src/openvpn/httpdigest.c
diff --git a/httpdigest.h b/src/openvpn/httpdigest.h
index 8423841..8423841 100644
--- a/httpdigest.h
+++ b/src/openvpn/httpdigest.h
diff --git a/init.c b/src/openvpn/init.c
index b8f57b2..b8f57b2 100644
--- a/init.c
+++ b/src/openvpn/init.c
diff --git a/init.h b/src/openvpn/init.h
index 5a1d1dc..5a1d1dc 100644
--- a/init.h
+++ b/src/openvpn/init.h
diff --git a/integer.h b/src/openvpn/integer.h
index f0fc196..f0fc196 100644
--- a/integer.h
+++ b/src/openvpn/integer.h
diff --git a/interval.c b/src/openvpn/interval.c
index 44d59d0..44d59d0 100644
--- a/interval.c
+++ b/src/openvpn/interval.c
diff --git a/interval.h b/src/openvpn/interval.h
index 4814ec9..4814ec9 100644
--- a/interval.h
+++ b/src/openvpn/interval.h
diff --git a/list.c b/src/openvpn/list.c
index fb93d0a..fb93d0a 100644
--- a/list.c
+++ b/src/openvpn/list.c
diff --git a/list.h b/src/openvpn/list.h
index adde36b..adde36b 100644
--- a/list.h
+++ b/src/openvpn/list.h
diff --git a/lladdr.c b/src/openvpn/lladdr.c
index fc01b63..fc01b63 100644
--- a/lladdr.c
+++ b/src/openvpn/lladdr.c
diff --git a/lladdr.h b/src/openvpn/lladdr.h
index d6c4256..d6c4256 100644
--- a/lladdr.h
+++ b/src/openvpn/lladdr.h
diff --git a/lzo.c b/src/openvpn/lzo.c
index 7e50fc9..7e50fc9 100644
--- a/lzo.c
+++ b/src/openvpn/lzo.c
diff --git a/lzo.h b/src/openvpn/lzo.h
index 5fb2a15..5fb2a15 100644
--- a/lzo.h
+++ b/src/openvpn/lzo.h
diff --git a/manage.c b/src/openvpn/manage.c
index 23e32db..23e32db 100644
--- a/manage.c
+++ b/src/openvpn/manage.c
diff --git a/manage.h b/src/openvpn/manage.h
index f681f8d..f681f8d 100644
--- a/manage.h
+++ b/src/openvpn/manage.h
diff --git a/mbuf.c b/src/openvpn/mbuf.c
index 0f36d3c..0f36d3c 100644
--- a/mbuf.c
+++ b/src/openvpn/mbuf.c
diff --git a/mbuf.h b/src/openvpn/mbuf.h
index a0de679..a0de679 100644
--- a/mbuf.h
+++ b/src/openvpn/mbuf.h
diff --git a/memdbg.h b/src/openvpn/memdbg.h
index 1f6bb67..1f6bb67 100644
--- a/memdbg.h
+++ b/src/openvpn/memdbg.h
diff --git a/misc.c b/src/openvpn/misc.c
index fb20980..fb20980 100644
--- a/misc.c
+++ b/src/openvpn/misc.c
diff --git a/misc.h b/src/openvpn/misc.h
index 107048d..107048d 100644
--- a/misc.h
+++ b/src/openvpn/misc.h
diff --git a/mroute.c b/src/openvpn/mroute.c
index 285b151..285b151 100644
--- a/mroute.c
+++ b/src/openvpn/mroute.c
diff --git a/mroute.h b/src/openvpn/mroute.h
index b72b5ff..b72b5ff 100644
--- a/mroute.h
+++ b/src/openvpn/mroute.h
diff --git a/mss.c b/src/openvpn/mss.c
index 660b62c..660b62c 100644
--- a/mss.c
+++ b/src/openvpn/mss.c
diff --git a/mss.h b/src/openvpn/mss.h
index 0b290c3..0b290c3 100644
--- a/mss.h
+++ b/src/openvpn/mss.h
diff --git a/mstats.c b/src/openvpn/mstats.c
index 2f29d94..2f29d94 100644
--- a/mstats.c
+++ b/src/openvpn/mstats.c
diff --git a/mstats.h b/src/openvpn/mstats.h
index dab05fe..dab05fe 100644
--- a/mstats.h
+++ b/src/openvpn/mstats.h
diff --git a/mtcp.c b/src/openvpn/mtcp.c
index 662cb9a..662cb9a 100644
--- a/mtcp.c
+++ b/src/openvpn/mtcp.c
diff --git a/mtcp.h b/src/openvpn/mtcp.h
index b677b48..b677b48 100644
--- a/mtcp.h
+++ b/src/openvpn/mtcp.h
diff --git a/mtu.c b/src/openvpn/mtu.c
index 494f939..494f939 100644
--- a/mtu.c
+++ b/src/openvpn/mtu.c
diff --git a/mtu.h b/src/openvpn/mtu.h
index 29ec21f..29ec21f 100644
--- a/mtu.h
+++ b/src/openvpn/mtu.h
diff --git a/mudp.c b/src/openvpn/mudp.c
index 7648ec6..7648ec6 100644
--- a/mudp.c
+++ b/src/openvpn/mudp.c
diff --git a/mudp.h b/src/openvpn/mudp.h
index 97f961b..97f961b 100644
--- a/mudp.h
+++ b/src/openvpn/mudp.h
diff --git a/multi.c b/src/openvpn/multi.c
index 65a834b..65a834b 100644
--- a/multi.c
+++ b/src/openvpn/multi.c
diff --git a/multi.h b/src/openvpn/multi.h
index 2bc0c8a..2bc0c8a 100644
--- a/multi.h
+++ b/src/openvpn/multi.h
diff --git a/ntlm.c b/src/openvpn/ntlm.c
index 217173f..217173f 100644
--- a/ntlm.c
+++ b/src/openvpn/ntlm.c
diff --git a/ntlm.h b/src/openvpn/ntlm.h
index 77903b0..77903b0 100644
--- a/ntlm.h
+++ b/src/openvpn/ntlm.h
diff --git a/occ-inline.h b/src/openvpn/occ-inline.h
index 516eb4d..516eb4d 100644
--- a/occ-inline.h
+++ b/src/openvpn/occ-inline.h
diff --git a/occ.c b/src/openvpn/occ.c
index 2fdbff0..2fdbff0 100644
--- a/occ.c
+++ b/src/openvpn/occ.c
diff --git a/occ.h b/src/openvpn/occ.h
index 5d88cc9..5d88cc9 100644
--- a/occ.h
+++ b/src/openvpn/occ.h
diff --git a/openvpn.c b/src/openvpn/openvpn.c
index b2175a1..b2175a1 100644
--- a/openvpn.c
+++ b/src/openvpn/openvpn.c
diff --git a/openvpn.h b/src/openvpn/openvpn.h
index a07b03f..a07b03f 100644
--- a/openvpn.h
+++ b/src/openvpn/openvpn.h
diff --git a/options.c b/src/openvpn/options.c
index d7f848e..d7f848e 100644
--- a/options.c
+++ b/src/openvpn/options.c
diff --git a/options.h b/src/openvpn/options.h
index 6af4b3a..6af4b3a 100644
--- a/options.h
+++ b/src/openvpn/options.h
diff --git a/otime.c b/src/openvpn/otime.c
index b295646..b295646 100644
--- a/otime.c
+++ b/src/openvpn/otime.c
diff --git a/otime.h b/src/openvpn/otime.h
index fd73bbd..fd73bbd 100644
--- a/otime.h
+++ b/src/openvpn/otime.h
diff --git a/packet_id.c b/src/openvpn/packet_id.c
index ba8973a..ba8973a 100644
--- a/packet_id.c
+++ b/src/openvpn/packet_id.c
diff --git a/packet_id.h b/src/openvpn/packet_id.h
index 7f4be8a..7f4be8a 100644
--- a/packet_id.h
+++ b/src/openvpn/packet_id.h
diff --git a/perf.c b/src/openvpn/perf.c
index d9dbafc..d9dbafc 100644
--- a/perf.c
+++ b/src/openvpn/perf.c
diff --git a/perf.h b/src/openvpn/perf.h
index c531d9c..c531d9c 100644
--- a/perf.h
+++ b/src/openvpn/perf.h
diff --git a/pf-inline.h b/src/openvpn/pf-inline.h
index 6b5dcb2..6b5dcb2 100644
--- a/pf-inline.h
+++ b/src/openvpn/pf-inline.h
diff --git a/pf.c b/src/openvpn/pf.c
index 0ef839e..0ef839e 100644
--- a/pf.c
+++ b/src/openvpn/pf.c
diff --git a/pf.h b/src/openvpn/pf.h
index 04adf0e..04adf0e 100644
--- a/pf.h
+++ b/src/openvpn/pf.h
diff --git a/ping-inline.h b/src/openvpn/ping-inline.h
index c724970..c724970 100644
--- a/ping-inline.h
+++ b/src/openvpn/ping-inline.h
diff --git a/ping.c b/src/openvpn/ping.c
index 191ad74..191ad74 100644
--- a/ping.c
+++ b/src/openvpn/ping.c
diff --git a/ping.h b/src/openvpn/ping.h
index 88f5f3a..88f5f3a 100644
--- a/ping.h
+++ b/src/openvpn/ping.h
diff --git a/pkcs11.c b/src/openvpn/pkcs11.c
index 7c0b90a..7c0b90a 100644
--- a/pkcs11.c
+++ b/src/openvpn/pkcs11.c
diff --git a/pkcs11.h b/src/openvpn/pkcs11.h
index 4261871..4261871 100644
--- a/pkcs11.h
+++ b/src/openvpn/pkcs11.h
diff --git a/pkcs11_backend.h b/src/openvpn/pkcs11_backend.h
index 6b5ad31..6b5ad31 100644
--- a/pkcs11_backend.h
+++ b/src/openvpn/pkcs11_backend.h
diff --git a/pkcs11_openssl.c b/src/openvpn/pkcs11_openssl.c
index aa1eccc..aa1eccc 100644
--- a/pkcs11_openssl.c
+++ b/src/openvpn/pkcs11_openssl.c
diff --git a/pkcs11_polarssl.c b/src/openvpn/pkcs11_polarssl.c
index 0f9daab..0f9daab 100644
--- a/pkcs11_polarssl.c
+++ b/src/openvpn/pkcs11_polarssl.c
diff --git a/plugin.c b/src/openvpn/plugin.c
index 4cc9c36..4cc9c36 100644
--- a/plugin.c
+++ b/src/openvpn/plugin.c
diff --git a/plugin.h b/src/openvpn/plugin.h
index 6f75e27..6f75e27 100644
--- a/plugin.h
+++ b/src/openvpn/plugin.h
diff --git a/pool.c b/src/openvpn/pool.c
index 60dc520..60dc520 100644
--- a/pool.c
+++ b/src/openvpn/pool.c
diff --git a/pool.h b/src/openvpn/pool.h
index fc9d6ab..fc9d6ab 100644
--- a/pool.h
+++ b/src/openvpn/pool.h
diff --git a/proto.c b/src/openvpn/proto.c
index 65a6b67..65a6b67 100644
--- a/proto.c
+++ b/src/openvpn/proto.c
diff --git a/proto.h b/src/openvpn/proto.h
index 8cd4ede..8cd4ede 100644
--- a/proto.h
+++ b/src/openvpn/proto.h
diff --git a/proxy.c b/src/openvpn/proxy.c
index 5e74af2..5e74af2 100644
--- a/proxy.c
+++ b/src/openvpn/proxy.c
diff --git a/proxy.h b/src/openvpn/proxy.h
index d89aa4a..d89aa4a 100644
--- a/proxy.h
+++ b/src/openvpn/proxy.h
diff --git a/ps.c b/src/openvpn/ps.c
index 182925b..182925b 100644
--- a/ps.c
+++ b/src/openvpn/ps.c
diff --git a/ps.h b/src/openvpn/ps.h
index 4280635..4280635 100644
--- a/ps.h
+++ b/src/openvpn/ps.h
diff --git a/push.c b/src/openvpn/push.c
index 8a8779d..8a8779d 100644
--- a/push.c
+++ b/src/openvpn/push.c
diff --git a/push.h b/src/openvpn/push.h
index 8c3f157..8c3f157 100644
--- a/push.h
+++ b/src/openvpn/push.h
diff --git a/pushlist.h b/src/openvpn/pushlist.h
index b252676..b252676 100644
--- a/pushlist.h
+++ b/src/openvpn/pushlist.h
diff --git a/reliable.c b/src/openvpn/reliable.c
index 1f238cc..1f238cc 100644
--- a/reliable.c
+++ b/src/openvpn/reliable.c
diff --git a/reliable.h b/src/openvpn/reliable.h
index 086761f..086761f 100644
--- a/reliable.h
+++ b/src/openvpn/reliable.h
diff --git a/route.c b/src/openvpn/route.c
index ca8f1da..ca8f1da 100644
--- a/route.c
+++ b/src/openvpn/route.c
diff --git a/route.h b/src/openvpn/route.h
index 25ecaee..25ecaee 100644
--- a/route.h
+++ b/src/openvpn/route.h
diff --git a/schedule.c b/src/openvpn/schedule.c
index f0482ab..f0482ab 100644
--- a/schedule.c
+++ b/src/openvpn/schedule.c
diff --git a/schedule.h b/src/openvpn/schedule.h
index 71c6d8c..71c6d8c 100644
--- a/schedule.h
+++ b/src/openvpn/schedule.h
diff --git a/session_id.c b/src/openvpn/session_id.c
index 95fa5f7..95fa5f7 100644
--- a/session_id.c
+++ b/src/openvpn/session_id.c
diff --git a/session_id.h b/src/openvpn/session_id.h
index 10f30ed..10f30ed 100644
--- a/session_id.h
+++ b/src/openvpn/session_id.h
diff --git a/shaper.c b/src/openvpn/shaper.c
index 1a89fc2..1a89fc2 100644
--- a/shaper.c
+++ b/src/openvpn/shaper.c
diff --git a/shaper.h b/src/openvpn/shaper.h
index 4825011..4825011 100644
--- a/shaper.h
+++ b/src/openvpn/shaper.h
diff --git a/sig.c b/src/openvpn/sig.c
index 33958b0..33958b0 100644
--- a/sig.c
+++ b/src/openvpn/sig.c
diff --git a/sig.h b/src/openvpn/sig.h
index 987efef..987efef 100644
--- a/sig.h
+++ b/src/openvpn/sig.h
diff --git a/socket.c b/src/openvpn/socket.c
index 0df58d1..0df58d1 100644
--- a/socket.c
+++ b/src/openvpn/socket.c
diff --git a/socket.h b/src/openvpn/socket.h
index 4a4f75d..4a4f75d 100644
--- a/socket.h
+++ b/src/openvpn/socket.h
diff --git a/socks.c b/src/openvpn/socks.c
index 949d256..949d256 100644
--- a/socks.c
+++ b/src/openvpn/socks.c
diff --git a/socks.h b/src/openvpn/socks.h
index b748bb3..b748bb3 100644
--- a/socks.h
+++ b/src/openvpn/socks.h
diff --git a/ssl.c b/src/openvpn/ssl.c
index c26756e..c26756e 100644
--- a/ssl.c
+++ b/src/openvpn/ssl.c
diff --git a/ssl.h b/src/openvpn/ssl.h
index aa6abc7..aa6abc7 100644
--- a/ssl.h
+++ b/src/openvpn/ssl.h
diff --git a/ssl_backend.h b/src/openvpn/ssl_backend.h
index 243c9e3..243c9e3 100644
--- a/ssl_backend.h
+++ b/src/openvpn/ssl_backend.h
diff --git a/ssl_common.h b/src/openvpn/ssl_common.h
index f3f43be..f3f43be 100644
--- a/ssl_common.h
+++ b/src/openvpn/ssl_common.h
diff --git a/ssl_openssl.c b/src/openvpn/ssl_openssl.c
index 1267e6b..1267e6b 100644
--- a/ssl_openssl.c
+++ b/src/openvpn/ssl_openssl.c
diff --git a/ssl_openssl.h b/src/openvpn/ssl_openssl.h
index fc2052c..fc2052c 100644
--- a/ssl_openssl.h
+++ b/src/openvpn/ssl_openssl.h
diff --git a/ssl_polarssl.c b/src/openvpn/ssl_polarssl.c
index 02dc233..02dc233 100644
--- a/ssl_polarssl.c
+++ b/src/openvpn/ssl_polarssl.c
diff --git a/ssl_polarssl.h b/src/openvpn/ssl_polarssl.h
index e6149b6..e6149b6 100644
--- a/ssl_polarssl.h
+++ b/src/openvpn/ssl_polarssl.h
diff --git a/ssl_verify.c b/src/openvpn/ssl_verify.c
index a7b361f..a7b361f 100644
--- a/ssl_verify.c
+++ b/src/openvpn/ssl_verify.c
diff --git a/ssl_verify.h b/src/openvpn/ssl_verify.h
index 1809137..1809137 100644
--- a/ssl_verify.h
+++ b/src/openvpn/ssl_verify.h
diff --git a/ssl_verify_backend.h b/src/openvpn/ssl_verify_backend.h
index 2ba3723..2ba3723 100644
--- a/ssl_verify_backend.h
+++ b/src/openvpn/ssl_verify_backend.h
diff --git a/ssl_verify_openssl.c b/src/openvpn/ssl_verify_openssl.c
index 200a570..200a570 100644
--- a/ssl_verify_openssl.c
+++ b/src/openvpn/ssl_verify_openssl.c
diff --git a/ssl_verify_openssl.h b/src/openvpn/ssl_verify_openssl.h
index 9c76d34..9c76d34 100644
--- a/ssl_verify_openssl.h
+++ b/src/openvpn/ssl_verify_openssl.h
diff --git a/ssl_verify_polarssl.c b/src/openvpn/ssl_verify_polarssl.c
index 699eb47..699eb47 100644
--- a/ssl_verify_polarssl.c
+++ b/src/openvpn/ssl_verify_polarssl.c
diff --git a/ssl_verify_polarssl.h b/src/openvpn/ssl_verify_polarssl.h
index cd7eb75..cd7eb75 100644
--- a/ssl_verify_polarssl.h
+++ b/src/openvpn/ssl_verify_polarssl.h
diff --git a/status.c b/src/openvpn/status.c
index 8fd89ef..8fd89ef 100644
--- a/status.c
+++ b/src/openvpn/status.c
diff --git a/status.h b/src/openvpn/status.h
index af16fd2..af16fd2 100644
--- a/status.h
+++ b/src/openvpn/status.h
diff --git a/syshead.h b/src/openvpn/syshead.h
index b305660..b305660 100644
--- a/syshead.h
+++ b/src/openvpn/syshead.h
diff --git a/tun.c b/src/openvpn/tun.c
index 7b74ebd..7b74ebd 100644
--- a/tun.c
+++ b/src/openvpn/tun.c
diff --git a/tun.h b/src/openvpn/tun.h
index 749bee5..749bee5 100644
--- a/tun.h
+++ b/src/openvpn/tun.h
diff --git a/win32.c b/src/openvpn/win32.c
index acf5ebc..acf5ebc 100644
--- a/win32.c
+++ b/src/openvpn/win32.c
diff --git a/win32.h b/src/openvpn/win32.h
index 09f897a..09f897a 100644
--- a/win32.h
+++ b/src/openvpn/win32.h
diff --git a/src/openvpnserv/Makefile.am b/src/openvpnserv/Makefile.am
new file mode 100644
index 0000000..7ce3375
--- /dev/null
+++ b/src/openvpnserv/Makefile.am
@@ -0,0 +1,20 @@
+#
+#  OpenVPN -- An application to securely tunnel IP networks
+#             over a single UDP port, with support for SSL/TLS-based
+#             session authentication and key exchange,
+#             packet encryption, packet authentication, and
+#             packet compression.
+#
+#  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
+#  Copyright (C) 2006-2012 Alon Bar-Lev <alon.barlev@gmail.com>
+#
+
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+
+if WIN32
+sbin_PROGRAMS = openvpnserv
+endif
+
+openvpnserv_SOURCES = \
+	openvpnserv.c \
+	service.h service.c
diff --git a/service-win32/openvpnserv.c b/src/openvpnserv/openvpnserv.c
index 0993064..0993064 100755
--- a/service-win32/openvpnserv.c
+++ b/src/openvpnserv/openvpnserv.c
diff --git a/service-win32/service.c b/src/openvpnserv/service.c
index 91b5821..91b5821 100644
--- a/service-win32/service.c
+++ b/src/openvpnserv/service.c
diff --git a/service-win32/service.h b/src/openvpnserv/service.h
index cf41ed7..cf41ed7 100644
--- a/service-win32/service.h
+++ b/src/openvpnserv/service.h
diff --git a/plugins/README b/src/plugins/README
index 6e490c5..6e490c5 100644
--- a/plugins/README
+++ b/src/plugins/README
diff --git a/plugins/auth-pam/Makefile b/src/plugins/auth-pam/Makefile
index d45a203..c0b9c79 100755
--- a/plugins/auth-pam/Makefile
+++ b/src/plugins/auth-pam/Makefile
@@ -13,7 +13,7 @@ else
 endif
 
 # This directory is where we will look for openvpn-plugin.h
-CPPFLAGS=-I../..
+CPPFLAGS=-I../../../include
 
 CC=gcc
 CFLAGS=-O2 -Wall
diff --git a/plugins/auth-pam/README b/src/plugins/auth-pam/README
index e123690..e123690 100644
--- a/plugins/auth-pam/README
+++ b/src/plugins/auth-pam/README
diff --git a/plugins/auth-pam/auth-pam.c b/src/plugins/auth-pam/auth-pam.c
index e52f632..e52f632 100644
--- a/plugins/auth-pam/auth-pam.c
+++ b/src/plugins/auth-pam/auth-pam.c
diff --git a/plugins/auth-pam/pamdl.c b/src/plugins/auth-pam/pamdl.c
index 8636a8e..8636a8e 100644
--- a/plugins/auth-pam/pamdl.c
+++ b/src/plugins/auth-pam/pamdl.c
diff --git a/plugins/auth-pam/pamdl.h b/src/plugins/auth-pam/pamdl.h
index b10b035..b10b035 100644
--- a/plugins/auth-pam/pamdl.h
+++ b/src/plugins/auth-pam/pamdl.h
diff --git a/plugins/defer/README b/src/plugins/defer/README
index d8990f8..d8990f8 100644
--- a/plugins/defer/README
+++ b/src/plugins/defer/README
diff --git a/plugins/examples/build b/src/plugins/defer/build
index 7605595..0612c08 100755
--- a/plugins/examples/build
+++ b/src/plugins/defer/build
@@ -6,7 +6,7 @@
 #
 
 # This directory is where we will look for openvpn-plugin.h
-CPPFLAGS="${CPPFLAGS:--I../..}"
+CPPFLAGS="${CPPFLAGS:--I../../../include}"
 
 CC="${CC:-gcc}"
 CFLAGS="${CFLAGS:--O2 -Wall -g}"
diff --git a/plugins/defer/simple.c b/src/plugins/defer/simple.c
index 6539865..6539865 100644
--- a/plugins/defer/simple.c
+++ b/src/plugins/defer/simple.c
diff --git a/plugins/defer/simple.def b/src/plugins/defer/simple.def
index a87507d..a87507d 100755
--- a/plugins/defer/simple.def
+++ b/src/plugins/defer/simple.def
diff --git a/plugins/defer/winbuild b/src/plugins/defer/winbuild
index 97e724a..82927d9 100755
--- a/plugins/defer/winbuild
+++ b/src/plugins/defer/winbuild
@@ -5,7 +5,7 @@
 #
 
 # This directory is where we will look for openvpn-plugin.h
-INCLUDE="-I.."
+INCLUDE="-I../../../build"
 
 CC_FLAGS="-O2 -Wall"
 
diff --git a/plugins/down-root/Makefile b/src/plugins/down-root/Makefile
index 9659b7f..e66c99a 100755
--- a/plugins/down-root/Makefile
+++ b/src/plugins/down-root/Makefile
@@ -3,7 +3,7 @@
 #
 
 # This directory is where we will look for openvpn-plugin.h
-CPPFLAGS=-I../..
+CPPFLAGS=-I../../../include
 
 CC=gcc
 CFLAGS=-O2 -Wall
diff --git a/plugins/down-root/README b/src/plugins/down-root/README
index d337ffe..d337ffe 100644
--- a/plugins/down-root/README
+++ b/src/plugins/down-root/README
diff --git a/plugins/down-root/down-root.c b/src/plugins/down-root/down-root.c
index fced23b..fced23b 100644
--- a/plugins/down-root/down-root.c
+++ b/src/plugins/down-root/down-root.c
diff --git a/plugins/examples/README b/src/plugins/examples/README
index 4400cd3..4400cd3 100644
--- a/plugins/examples/README
+++ b/src/plugins/examples/README
diff --git a/plugins/defer/build b/src/plugins/examples/build
index 9629c11..bbb05f7 100755
--- a/plugins/defer/build
+++ b/src/plugins/examples/build
@@ -6,7 +6,7 @@
 #
 
 # This directory is where we will look for openvpn-plugin.h
-CPPFLAGS="${CPPFLAGS:--I../..}"
+CPPFLAGS="${CPPFLAGS:--I../../..}"
 
 CC="${CC:-gcc}"
 CFLAGS="${CFLAGS:--O2 -Wall -g}"
diff --git a/plugins/examples/log.c b/src/plugins/examples/log.c
index 1cc4650..1cc4650 100644
--- a/plugins/examples/log.c
+++ b/src/plugins/examples/log.c
diff --git a/plugins/examples/log_v3.c b/src/plugins/examples/log_v3.c
index 187c592..187c592 100644
--- a/plugins/examples/log_v3.c
+++ b/src/plugins/examples/log_v3.c
diff --git a/plugins/examples/simple.c b/src/plugins/examples/simple.c
index f26d89f..f26d89f 100644
--- a/plugins/examples/simple.c
+++ b/src/plugins/examples/simple.c
diff --git a/plugins/examples/simple.def b/src/plugins/examples/simple.def
index a87507d..a87507d 100755
--- a/plugins/examples/simple.def
+++ b/src/plugins/examples/simple.def
diff --git a/plugins/examples/winbuild b/src/plugins/examples/winbuild
index 97e724a..decf05f 100755
--- a/plugins/examples/winbuild
+++ b/src/plugins/examples/winbuild
@@ -5,7 +5,7 @@
 #
 
 # This directory is where we will look for openvpn-plugin.h
-INCLUDE="-I.."
+INCLUDE="-I../../../include"
 
 CC_FLAGS="-O2 -Wall"
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..6ae845b
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,24 @@
+#
+#  OpenVPN -- An application to securely tunnel IP networks
+#             over a single UDP port, with support for SSL/TLS-based
+#             session authentication and key exchange,
+#             packet encryption, packet authentication, and
+#             packet compression.
+#
+#  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
+#  Copyright (C) 2006-2012 Alon Bar-Lev <alon.barlev@gmail.com>
+#
+
+MAINTAINERCLEANFILES = \
+	$(srcdir)/Makefile.in
+
+test_scripts = t_lpback.sh t_cltsrv.sh
+
+TESTS_ENVIRONMENT = top_srcdir="$(top_srcdir)"
+TESTS = $(test_scripts)
+
+dist_noinst_SCRIPTS = \
+	$(test_scripts) \
+	t_cltsrv-down.sh \
+	t_client.sh
+
diff --git a/t_client.rc-sample b/tests/t_client.rc-sample
index e766b5d..dcb3e4a 100644
--- a/t_client.rc-sample
+++ b/tests/t_client.rc-sample
@@ -7,9 +7,10 @@
 #
 # define these - if empty, no tests will run
 #
-CA_CERT="/home/openvpn-test-ca/keys/ca.crt"
-CLIENT_KEY="/home/openvpn-test-ca/keys/client-test.key"
-CLIENT_CERT="/home/openvpn-test-ca/keys/client-test.crt"
+top_srcdir="${top_srcdir:-..}"
+CA_CERT="${top_srcdir}/sample/sample-keys/ca.crt"
+CLIENT_KEY="${top_srcdir}/sample/sample-keys/client.key"
+CLIENT_CERT="${top_srcdir}/sample/sample-keys/client.crt"
 #
 # remote host (used as macro below)
 #
diff --git a/t_client.sh.in b/tests/t_client.sh.in
index 47839de..7ba124c 100755
--- a/t_client.sh.in
+++ b/tests/t_client.sh.in
@@ -12,17 +12,16 @@
 # - for "ping6" checks: fping6 binary in $PATH
 #
 
-if [ -r ./t_client.rc ] ; then
-    . ./t_client.rc
-elif [ -r "${srcdir}"/t_client.rc ] ; then
+srcdir="${srcdir:-.}"
+top_builddir="${top_builddir:-..}"
+if [ -r "${srcdir}"/t_client.rc ] ; then
     . "${srcdir}"/t_client.rc
 else
-    echo "$0: cannot find 't_client.rc' in current directory or" >&2
-    echo "$0: source dir ('${srcdir}').  SKIPPING TEST." >&2
+    echo "$0: cannot find 't_client.rc' in ('${srcdir}'). SKIPPING TEST." >&2
     exit 77
 fi
 
-if [ ! -x ./openvpn ]
+if [ ! -x "${top_builddir}/src/openvpn/openvpn" ]
 then
     echo "no (executable) openvpn binary in current directory. FAIL." >&2
     exit 1
@@ -228,8 +227,8 @@ do
 	continue
     fi
 
-    echo " run ./openvpn $openvpn_conf"
-    $RUN_SUDO ./openvpn $openvpn_conf >$LOGDIR/$SUF:openvpn.log &
+    echo " run openvpn $openvpn_conf"
+    $RUN_SUDO "${top_builddir}/src/openvpn/openvpn" $openvpn_conf >$LOGDIR/$SUF:openvpn.log &
     opid=$!
 
     # make sure openvpn client is terminated in case shell exits
diff --git a/t_cltsrv-down.sh b/tests/t_cltsrv-down.sh
index 2ef852a..2ef852a 100755
--- a/t_cltsrv-down.sh
+++ b/tests/t_cltsrv-down.sh
diff --git a/t_cltsrv.sh b/tests/t_cltsrv.sh
index 5bcbfc7..752251e 100755
--- a/t_cltsrv.sh
+++ b/tests/t_cltsrv.sh
@@ -19,6 +19,9 @@
 # 02110-1301, USA.
 
 set -e
+srcdir="${srcdir:-.}"
+top_srcdir="${top_srcdir:-..}"
+top_builddir="${top_builddir:-..}"
 trap "rm -f log.$$ log.$$.signal ; trap 0 ; exit 77" 1 2 15
 trap "rm -f log.$$ log.$$.signal ; exit 1" 0 3
 addopts=
@@ -41,8 +44,9 @@ esac
 
 # make sure that the --down script is executable -- fail (rather than
 # skip) test if it isn't.
-downscript="t_cltsrv-down.sh"
-test -x "${srcdir}"/$downscript || chmod +x "${srcdir}"/$downscript || { echo >&2 "$downscript is not executable, failing." ; exit 1 ; }
+downscript="../tests/t_cltsrv-down.sh"
+root="${top_srcdir}/sample"
+test -x "${root}/${downscript}" || chmod +x "${root}/${downscript}" || { echo >&2 "${root}/${downscript} is not executable, failing." ; exit 1 ; }
 echo "The following test will take about two minutes." >&2
 echo "If the addresses are in use, this test will retry up to two times." >&2
 
@@ -51,8 +55,8 @@ success=0
 for i in 1 2 3 ; do
   set +e
   (
-  ./openvpn --script-security 2 --cd "${srcdir}" ${addopts} --setenv role srv --down "$downscript" --tls-exit --ping-exit 180 --config sample-config-files/loopback-server &
-  ./openvpn --script-security 2 --cd "${srcdir}" ${addopts} --setenv role clt --down "$downscript" --tls-exit --ping-exit 180 --config sample-config-files/loopback-client
+  "${top_builddir}/src/openvpn/openvpn" --script-security 2 --cd "${root}" ${addopts} --setenv role srv --down "${downscript}" --tls-exit --ping-exit 180 --config "sample-config-files/loopback-server" &
+  "${top_builddir}/src/openvpn/openvpn" --script-security 2 --cd "${top_srcdir}/sample" ${addopts} --setenv role clt --down "${downscript}" --tls-exit --ping-exit 180 --config "sample-config-files/loopback-client"
   ) 3>log.$$.signal >log.$$ 2>&1
   e1=$?
   wait $!
diff --git a/t_lpback.sh b/tests/t_lpback.sh
index b860de4..40767a1 100755
--- a/t_lpback.sh
+++ b/tests/t_lpback.sh
@@ -19,11 +19,12 @@
 # 02110-1301, USA.
 
 set -e
+top_builddir="${top_builddir:-..}"
 trap "rm -f key.$$ log.$$ ; trap 0 ; exit 77" 1 2 15
 trap "rm -f key.$$ log.$$ ; exit 1" 0 3
-./openvpn --genkey --secret key.$$
+"${top_builddir}/src/openvpn/openvpn" --genkey --secret key.$$
 set +e
-( ./openvpn --test-crypto --secret key.$$ ) >log.$$ 2>&1
+( "${top_builddir}/src/openvpn/openvpn" --test-crypto --secret key.$$ ) >log.$$ 2>&1
 e=$?
 if [ $e != 0 ] ; then cat log.$$ ; fi
 rm key.$$ log.$$