diff --git a/CASA-auth-token/server-java/Svc/templates/windows/Makefile.am b/CASA-auth-token/server-java/Svc/templates/windows/Makefile.am
index ec7775d1..9c8d1dea 100644
--- a/CASA-auth-token/server-java/Svc/templates/windows/Makefile.am
+++ b/CASA-auth-token/server-java/Svc/templates/windows/Makefile.am
@@ -32,6 +32,7 @@ EXTRA_DIST = CasaAuthPolicyEditor.bat \
 		CasaSvcSettingsEditor.bat \
 		startup.bat \
 		shutdown.bat \
+		casa_crypto.properties \
 		log4j.properties
 
 .PHONY: package package-clean package-install package-uninstall
diff --git a/CASA-auth-token/server-java/Svc/windows/Makefile.am b/CASA-auth-token/server-java/Svc/windows/Makefile.am
index d8cc1145..aa01abcb 100644
--- a/CASA-auth-token/server-java/Svc/windows/Makefile.am
+++ b/CASA-auth-token/server-java/Svc/windows/Makefile.am
@@ -26,7 +26,7 @@ DIST_SUBDIRS =
 
 CFILES =
 
-EXTRA_DIST = casa_crypto.properties
+EXTRA_DIST =
 
 ROOT = ../..
 
diff --git a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in
index 1d241ebd..dbf5f858 100644
--- a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in
+++ b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in
@@ -18,7 +18,7 @@
 Name:          @PACKAGE@ 
 URL:           http://www.novell.com/products
 BuildRequires:  gcc-c++ glib2-devel identity-abstraction insserv libstdc++ libstdc++-devel mono-devel pkgconfig servletapi5 sysvinit xerces-j2 xml-commons-apis
-BuildRequires:  java-sdk-1.5.0 update-alternatives log4j jakarta-commons-logging pwdutils CASA-devel
+BuildRequires:  java-sdk-1.5.0 update-alternatives log4j jakarta-commons-logging pwdutils CASA-devel curl
 %define prefix /usr
 License:       LGPL
 Group:         Applications/System
@@ -30,7 +30,7 @@ Summary:       Novell CASA Authentication Token Service
 Source:        %{name}-%{version}.tar.bz2
 BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 Requires:      jre >= 1.5.0
-Requires:      servletapi5 tomcat5 sysvinit insserv identity-abstraction sed log4j xerces-j2 CASA
+Requires:      servletapi5 tomcat5 sysvinit insserv identity-abstraction sed log4j xerces-j2 CASA curl
 PreReq:        %fillup_prereq %insserv_prereq
 PreReq:        /usr/bin/awk, /usr/bin/test, /bin/grep, /bin/cat, /usr/bin/install, /bin/pwd
 PreReq:        /usr/sbin/groupadd, /usr/sbin/useradd, /usr/sbin/userdel, /usr/bin/getent
diff --git a/CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in b/CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in
index a1351025..f88a67c7 100644
--- a/CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in
+++ b/CASA-auth-token/yast2-casa-ats/yast2-casa-ats.spec.in
@@ -1,8 +1,8 @@
 @HEADER-COMMENT@
 
 @HEADER@
-Requires:	yast2 CASA_auth_token_svc curl openssl
-BuildRequires:	perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite CASA_auth_token_svc curl openssl yast2-theme-NLD java-sdk-1.5.0 update-alternatives log4j jakarta-commons-logging pwdutils CASA-devel
+Requires:	yast2 CASA_auth_token_svc openssl
+BuildRequires:	perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite CASA_auth_token_svc openssl yast2-theme-NLD java-sdk-1.5.0 update-alternatives log4j jakarta-commons-logging pwdutils CASA-devel
 
 BuildArchitectures:	noarch