diff --git a/.cvsignore b/.cvsignore
index ef1e5f2..79608e6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cairo-dock-sources-svn1071_trunk.tar.bz2
+cairo-dock-sources-svn1080_trunk.tar.bz2
diff --git a/cairo-dock.spec b/cairo-dock.spec
index 4744561..a3c0230 100644
--- a/cairo-dock.spec
+++ b/cairo-dock.spec
@@ -4,12 +4,12 @@
 # mv trunk opt/cairo-dock
 # tar cjf cairo-dock-sources-%%{tag}.tar.bz2 opt/
 
-%define		tarballver	svn1071_trunk
-%define		mainver		1.5.6
+%define		tarballver	svn1080_trunk
+%define		mainver		1.6.0
 %define		build_gecko	1
 
 
-%define		fedora_rel	2.%{tarballver}
+%define		fedora_rel	0.1.%{tarballver}
 
 
 %if 0%{?fedora} >= 9
@@ -131,6 +131,8 @@ find . -type d -name \*CVS | sort -r | xargs %{__rm} -rf
 
 # A. main
 pushd opt/cairo-dock/trunk/cairo-dock
+# temporary fix
+%{__sed} -i.inline -e 's|^inline ||' src/cairo-dock-draw.*
 
 # permission
 for dir in */
@@ -146,6 +148,9 @@ autoreconf -i -f
 
 # B. themes
 cd ../themes
+
+# temporary fix
+touch _Azur_/dialog-ok.svg
 autoreconf -i -f
 
 # C. plug-ins
@@ -188,13 +193,35 @@ cd ..
 %{__rm} -rf weblets/
 %endif
 
+# First deal with subdirs in topdir configure.ac, then else
+Subdirs=$(%{__sed} -n -e '/SUBDIR/s|^.*SUBDIR.*=||p' Makefile.am | sed -e 's|\.||' -e 's|po||')
+# temporary fix
+sed -i.acdebug \
+	-e "s|AC_SUBST[ \t]*(\(.*\),[ \t]*\"*\([^\"][^\"]*\)\"*)$|\1=\"\2\"\nAC_SUBST(\1)\n|" \
+	configure.ac
+autoreconf -f -i
+
 for dir in */
 	do
+	skip=0
+	for ddir in $Subdirs
+		do
+		if [ $dir == ${ddir}/ ] ; then skip=1 ; fi
+	done
+	for ddir in autom* po
+		do
+		if [ $dir == ${ddir}/ ] ; then skip=2 ; fi
+	done
+	if [ $skip == 2 ] ; then continue ; fi
 	cd $dir
 	%{__sed} -i.error \
 		-e 's|-O3|-O2|' \
 		-e 's|-Werror\\|\\|' \
 		src/Makefile.am 
+	if [ $skip == 1 ] ; then 
+		cd ..
+		continue
+	fi
 	autoreconf -i -f
 	cd ..
 done
@@ -222,8 +249,24 @@ cd ../themes
 
 # C plug-ins
 cd ../plug-ins
+
+# First deal with subdirs in topdir configure.ac, then else
+Subdirs=$(%{__sed} -n -e '/SUBDIR/s|^.*SUBDIR.*=||p' Makefile.am | sed -e 's|\.||' -e 's|po||')
+
+%configure
+# Parallel make fails some times, but it is gerenally fast
+# so do parallel make anyway first
+%{__make} %{?_smp_mflags} -k || :
+%{__make} -k || status=$((status+1))
+
 for dir in */
 	do
+	skip=0
+	for ddir in $Subdirs autom* po
+		do
+		if [ $dir == ${ddir}/ ] ; then skip=1 ; fi
+	done
+	if [ $skip == 1 ] ; then continue ; fi
 	cd $dir
 
 	%configure
@@ -289,10 +332,31 @@ popd # from $RPM_BUILD_ROOT
 %{__mkdir} -p $TOPDIR/{lang-plug-ins,lang-gecko}
 
 cd ../plug-ins
+# First deal with subdirs in topdir configure.ac, then else
+Subdirs=$(%{__sed} -n -e '/SUBDIR/s|^.*SUBDIR.*=||p' Makefile.am | sed -e 's|\.||' -e 's|po||')
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	INSTALL="%{__install} -p"
+
 for dir in */
 	do
+	skip=0
+	for ddir in $Subdirs autom* po
+		do
+		if [ $dir == ${ddir}/ ] ; then skip=1 ; fi
+	done
+	# don't skip here
+	# if [ $skip == 1 ] ; then continue ; fi
+
+	for ddir in autom* po
+		do
+		if [ $dir == ${ddir}/ ] ; then skip=2 ; fi
+	done
+	if [ $skip == 2 ] ; then continue ; fi
+
 	cd $dir
-	%{__make} install \
+	[ $skip != 1 ] && \
+		%{__make} install \
 		DESTDIR=$RPM_BUILD_ROOT \
 		INSTALL="%{__install} -p"
 
@@ -408,8 +472,11 @@ popd # from $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Tue Jun  3 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
-- svn 1071
+* Thu Jun  5 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
+- svn 1080
+
+* Thu Jun  5 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.6.0-0.1.svn1080_trunk
+- Prepare for using unified configure script on plug-ins directory
 
 * Wed May 27 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.5.6-1.date20080528
 - 1.5.6
diff --git a/sources b/sources
index 0326ea2..920e887 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a8994521aabdea976fed121ed48e5ee  cairo-dock-sources-svn1071_trunk.tar.bz2
+a2991af849e7495cbd72c025fa8013f1  cairo-dock-sources-svn1080_trunk.tar.bz2