diff --git a/VERSION b/VERSION
index b5021469..75a22a26 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.2
+3.0.3
diff --git a/devtools/admin/Makefile.am.common b/devtools/admin/Makefile.am.common
index 771cae32..bc63697b 100644
--- a/devtools/admin/Makefile.am.common
+++ b/devtools/admin/Makefile.am.common
@@ -15,6 +15,7 @@ ${ybcfiles}: %.ybc: %.ycp $(ycpchook)
 CLEANFILES = ${ybcfiles}
 DISTCLEANFILES = .dep
 
+if HAS_YCP_MODULES
 # Needs to be outside "." because of cases
 # where ycpchook contains a symlink to "."
 # Otherwise "." keeps being newer than .dep and we loop.
@@ -26,6 +27,8 @@ NEWDEP=${top_builddir}/.dep.new
 	${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP}
 	cat ${NEWDEP} > .dep
 	rm ${NEWDEP}
+-include .dep
+endif
 
 dist-hook: check-syntax
 
@@ -58,4 +61,3 @@ check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpc
 	  fi; \
 	fi
 
--include .dep
diff --git a/devtools/bin/y2autoconf b/devtools/bin/y2autoconf
index 7a3bb8d6..adfc6d33 100755
--- a/devtools/bin/y2autoconf
+++ b/devtools/bin/y2autoconf
@@ -390,6 +390,19 @@ fi
 AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
     AC_MSG_WARN([yast2-testsuite.rpm is not installed])
 ])
+
+# handle .dep files in Makefile.am.common if any YCP module is present
+AC_MSG_CHECKING([for YCP modules])
+
+# YCP module file name starts with an upper case letter
+[find . -type f | grep -q "[[:upper:]][^/]*\\.ycp$" && has_ycp_modules=1]
+AM_CONDITIONAL([HAS_YCP_MODULES], [test -n "$has_ycp_modules"])
+
+if test -n "$has_ycp_modules"; then
+  AC_MSG_RESULT([found])
+else
+  AC_MSG_RESULT([not found])
+fi
 ',
 
     # generate output
diff --git a/package/yast2-devtools.changes b/package/yast2-devtools.changes
index ce93ff32..3fd59baf 100644
--- a/package/yast2-devtools.changes
+++ b/package/yast2-devtools.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug  9 08:53:18 UTC 2013 - lslezak@suse.cz
+
+- Makefile.am.common - do not create empty ".dep" YCP dependency
+  file when there is no YCP module file
+- 3.0.3
+
 -------------------------------------------------------------------
 Wed Aug  7 07:38:46 UTC 2013 - lslezak@suse.cz