diff --git a/Makefile.am b/Makefile.am
index 26b80f38..a1c210e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,6 @@
 #
 
 LDADD = @LIBOBJS@
-.PHONY: plugin
 
 # This option prevents autoreconf from overriding our COPYING and
 # INSTALL targets:
@@ -49,7 +48,7 @@ EXTRA_DIST = \
 	tap-win32 \
 	contrib \
 	debug \
-	plugin \
+	plugins \
 	win
 
 SUBDIRS = \
diff --git a/openvpn.spec.in b/openvpn.spec.in
index c42e7c6a..9a45c799 100644
--- a/openvpn.spec.in
+++ b/openvpn.spec.in
@@ -103,13 +103,13 @@ and portability to most major OS platforms.
 %__make
 
 # Build down-root plugin
-pushd plugin/down-root
+pushd plugins/down-root
 %__make
 popd
 
 # Build auth-pam plugin
 %if %{build_auth_pam}
-pushd plugin/auth-pam
+pushd plugins/auth-pam
 %__make
 popd
 %endif
@@ -153,16 +153,16 @@ popd
 # Install the plugins
 #
 
-%__mkdir_p %{buildroot}%{_datadir}/%{name}/plugin/lib
+%__mkdir_p %{buildroot}%{_datadir}/%{name}/plugins/lib
 
 for pi in auth-pam down-root; do
-  %__mv -f plugin/$pi/README plugin/README.$pi
-  if [ -e plugin/$pi/openvpn-$pi.so ]; then
-    %__install -c -m 755 plugin/$pi/openvpn-$pi.so %{buildroot}%{_datadir}/openvpn/plugin/lib/openvpn-$pi.so
+  %__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
   fi
 done
 
-%__mv -f plugin/README plugin/README.plugins
+%__mv -f plugins/README plugins/README.plugins
 
 #
 # Clean section
@@ -222,7 +222,7 @@ fi
 %endif
 
 # Install extra %doc stuff
-%doc contrib/ easy-rsa/ sample-*/ plugin/README.*
+%doc contrib/ easy-rsa/ sample-*/ plugins/README.*
 
 %changelog
 * Thu Jul 30 2009 David Sommerseth <dazo@users.sourceforge.net>
diff --git a/plugin/README b/plugins/README
similarity index 100%
rename from plugin/README
rename to plugins/README
diff --git a/plugin/auth-pam/.svnignore b/plugins/auth-pam/.svnignore
similarity index 100%
rename from plugin/auth-pam/.svnignore
rename to plugins/auth-pam/.svnignore
diff --git a/plugin/auth-pam/Makefile b/plugins/auth-pam/Makefile
similarity index 100%
rename from plugin/auth-pam/Makefile
rename to plugins/auth-pam/Makefile
diff --git a/plugin/auth-pam/README b/plugins/auth-pam/README
similarity index 100%
rename from plugin/auth-pam/README
rename to plugins/auth-pam/README
diff --git a/plugin/auth-pam/auth-pam.c b/plugins/auth-pam/auth-pam.c
similarity index 100%
rename from plugin/auth-pam/auth-pam.c
rename to plugins/auth-pam/auth-pam.c
diff --git a/plugin/auth-pam/pamdl.c b/plugins/auth-pam/pamdl.c
similarity index 100%
rename from plugin/auth-pam/pamdl.c
rename to plugins/auth-pam/pamdl.c
diff --git a/plugin/auth-pam/pamdl.h b/plugins/auth-pam/pamdl.h
similarity index 100%
rename from plugin/auth-pam/pamdl.h
rename to plugins/auth-pam/pamdl.h
diff --git a/plugin/defer/README b/plugins/defer/README
similarity index 100%
rename from plugin/defer/README
rename to plugins/defer/README
diff --git a/plugin/defer/build b/plugins/defer/build
similarity index 100%
rename from plugin/defer/build
rename to plugins/defer/build
diff --git a/plugin/defer/simple.c b/plugins/defer/simple.c
similarity index 100%
rename from plugin/defer/simple.c
rename to plugins/defer/simple.c
diff --git a/plugin/defer/simple.def b/plugins/defer/simple.def
similarity index 100%
rename from plugin/defer/simple.def
rename to plugins/defer/simple.def
diff --git a/plugin/defer/winbuild b/plugins/defer/winbuild
similarity index 100%
rename from plugin/defer/winbuild
rename to plugins/defer/winbuild
diff --git a/plugin/down-root/Makefile b/plugins/down-root/Makefile
similarity index 100%
rename from plugin/down-root/Makefile
rename to plugins/down-root/Makefile
diff --git a/plugin/down-root/README b/plugins/down-root/README
similarity index 100%
rename from plugin/down-root/README
rename to plugins/down-root/README
diff --git a/plugin/down-root/down-root.c b/plugins/down-root/down-root.c
similarity index 100%
rename from plugin/down-root/down-root.c
rename to plugins/down-root/down-root.c
diff --git a/plugin/examples/README b/plugins/examples/README
similarity index 100%
rename from plugin/examples/README
rename to plugins/examples/README
diff --git a/plugin/examples/build b/plugins/examples/build
similarity index 100%
rename from plugin/examples/build
rename to plugins/examples/build
diff --git a/plugin/examples/log.c b/plugins/examples/log.c
similarity index 100%
rename from plugin/examples/log.c
rename to plugins/examples/log.c
diff --git a/plugin/examples/log_v3.c b/plugins/examples/log_v3.c
similarity index 100%
rename from plugin/examples/log_v3.c
rename to plugins/examples/log_v3.c
diff --git a/plugin/examples/simple.c b/plugins/examples/simple.c
similarity index 100%
rename from plugin/examples/simple.c
rename to plugins/examples/simple.c
diff --git a/plugin/examples/simple.def b/plugins/examples/simple.def
similarity index 100%
rename from plugin/examples/simple.def
rename to plugins/examples/simple.def
diff --git a/plugin/examples/winbuild b/plugins/examples/winbuild
similarity index 100%
rename from plugin/examples/winbuild
rename to plugins/examples/winbuild