diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 713398fc..9efc0469 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -78,7 +78,7 @@ RPM_CONFLICTS_RUN        += $(call proj_query, pkg-conflicts --dont-expand-versi
 
 RPM_UPLOAD_OS_NAME        = $(shell echo $(OS) | sed 's/-.*//')
 RPM_UPLOAD_OS_VERSION     = $(shell echo $(OS) | sed 's/[^-]\+-//')
-RPM_UPLOAD_URLPREFIX      ?= rsync_ssh://root@ftp.jannet.de:/srv/ftp/pub/packages/linux/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION)/inst-source
+RPM_UPLOAD_URLPREFIX      ?= rsync_ssh://root@ftp.jannet.de:/srv/ftp/pub/packages/linux/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION)
 RPM_UPLOAD_USER           ?= $(shell id -un)
 RPM_UPLOAD_GROUP          ?= $(shell id -gn)
 RPM_UPLOAD_FILE_ATTRIB    ?= 644:755:$(RPM_UPLOAD_USER).$(RPM_UPLOAD_GROUP)
diff --git a/make/smart-selection.mk b/make/smart-selection.mk
index 75187364..314dff69 100644
--- a/make/smart-selection.mk
+++ b/make/smart-selection.mk
@@ -5,7 +5,7 @@ UPLOAD_SH               = sh $(MOD_SCRIPT_DIR)/upload.sh
 
 DISTRIBUTOR             = $(shell $(GET_OS_SH) | cut -d- -f1)
 DISTRO_RELEASE          = $(shell $(GET_OS_SH) | cut -d- -f2-)
-UPLOAD_URL              = root@ftp.jannet.de:/srv/ftp/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/inst-source/setup/descr
+UPLOAD_URL              = root@ftp.jannet.de:/srv/ftp/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/setup/descr
 
 SELECTION               = $(shell $(GENERATE_SELECTION) -s)-packages.txt
 CHANNEL_LIST            = $(shell $(GENERATE_SELECTION) -s)-channels.txt
@@ -45,7 +45,7 @@ upload.done: selection.done
 
 rpm-install-smart.done:
 	if ! rpm -q smart >/dev/null 2>&1 ; then \
-		wget ftp.jannet.de:/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/inst-source/rpm/i686/smart.rpm; \
+		wget ftp.jannet.de:/pub/packages/linux/$(DISTRIBUTOR)/$(DISTRO_RELEASE)/rpm/i686/smart.rpm; \
 		sudo rpm -U smart.rpm; \
 		sudo smart update; \
 		sudo smart channel --remove-all; \
diff --git a/make/suse-selection.mk b/make/suse-selection.mk
index a3617659..e0345816 100644
--- a/make/suse-selection.mk
+++ b/make/suse-selection.mk
@@ -3,7 +3,7 @@ include $(MODDIR)/make/defs.mk
 
 GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh
 SUSE_RELEASE = 10.1
-UPLOAD_URL = root@ftp.jannet.de:/srv/ftp/pub/packages/linux/suse/$(SUSE_RELEASE)/inst-source/setup/descr
+UPLOAD_URL = root@ftp.jannet.de:/srv/ftp/pub/packages/linux/suse/$(SUSE_RELEASE)/setup/descr
 UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
 
 SELECTION = $(shell sh $(GENERATE_SELECTION) -s).sel
diff --git a/make/upload-defs-rpm.mk b/make/upload-defs-rpm.mk
index 366aec0c..95644523 100644
--- a/make/upload-defs-rpm.mk
+++ b/make/upload-defs-rpm.mk
@@ -20,9 +20,9 @@
 #OS_NAME = $(shell echo $(OS) | sed 's/-.*//')
 #OS_VERSION = $(shell echo $(OS) | sed 's/[^-]\+-//')
 #
-## $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)/inst-source/rpm/src
+## $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)/rpm/src
 #FTP_PCKG_DIR             ?= /pub/packages
-#PCKG_ROOT                ?= $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)/inst-source
+#PCKG_ROOT                ?= $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)
 ##PCKG_ROOT                 = $(FTP_PCKG_DIR)/$(RPM_PROJECT)
 #CURRENT_SRC               = $(warning PCKG_ROOT=$(PCKG_ROOT))$(PCKG_ROOT)/tgz/$(PCKG_TAR)
 #CURRENT_RPM_RUN_I386      = $(PCKG_ROOT)/$(RPM_ARCH)/$(PCKG_RPM_RUN_I386)
diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh
index 2d391c1f..12f9b95d 100644
--- a/scripts/integrate-distro.sh
+++ b/scripts/integrate-distro.sh
@@ -616,8 +616,8 @@ cfg_default()
 	#update          0 ftp://ftp/pub/mirror/suse/update/$suse_version
 
 	[repos.payload]
-	#ftp.jannet.de   10 ftp://dspdev:123qweasd@ftp.jannet.de/pub/packages/linux/suse/$suse_version/inst-source
-	ftp.jannet.de   10 ftp://dspdev:123qweasd@ftp/pub/mirror/jannet/ftp/pub/packages/linux/suse/$suse_version/inst-source
+	#ftp.jannet.de   10 ftp://dspdev:123qweasd@ftp.jannet.de/pub/packages/linux/suse/$suse_version
+	ftp.jannet.de   10 ftp://dspdev:123qweasd@ftp/pub/mirror/jannet/ftp/pub/packages/linux/suse/$suse_version
 	ftp.priv.lcl     5 ftp://dspdev:123qweasd@ftp.priv.lcl/pub/local/packages/suse/$suse_version
 
 	[repos.special]
diff --git a/scripts/jannet b/scripts/jannet
index 191526cd..08588fa5 100644
--- a/scripts/jannet
+++ b/scripts/jannet
@@ -159,7 +159,7 @@ init)
 		echo -n "adding installation source ... "
 		sudo smart channel -y --add ftp.jannet.de \
 			type=yast2 \
-			baseurl=ftp://dspadm:dspasswd@ftp.jannet.de/pub/packages/linux/suse/10.1/inst-source \
+			baseurl=ftp://dspadm:dspasswd@ftp.jannet.de/pub/packages/linux/suse/10.1 \
 			>/dev/null 2>&1
 		if channel_present; then echo done; else echo failed; fi
 	fi
@@ -204,7 +204,7 @@ info)
 	;;
 cpp-glib)
 	sudo rpm -U --replacefiles --replacepkgs --oldpackage \
-		ftp://dspadm@ftp.jannet.de/pub/packages/linux/suse/10.1/inst-source/rpm/i586/glib2-2.8.5-19.i586.rpm
+		ftp://dspadm@ftp.jannet.de/pub/packages/linux/suse/10.1/rpm/i586/glib2-2.8.5-19.i586.rpm
 	check_ldconfig
 	;;
 rpmnew)
diff --git a/scripts/jw-pkg b/scripts/jw-pkg
index 0c8e265b..f6709519 100644
--- a/scripts/jw-pkg
+++ b/scripts/jw-pkg
@@ -358,7 +358,7 @@ init)
 		echo -n "adding installation source ... "
 		sudo smart channel -y --add ftp.jannet.de \
 			type=yast2 \
-			baseurl=ftp://dspadm:dspasswd@ftp.jannet.de/pub/packages/linux/suse/10.1/inst-source \
+			baseurl=ftp://dspadm:dspasswd@ftp.jannet.de/pub/packages/linux/suse/10.1 \
 			>/dev/null 2>&1
 		if channel_present; then echo done; else echo failed; fi
 	fi
@@ -406,7 +406,7 @@ list_projects)
 	;;
 cpp_glib)
 	sudo rpm -U --replacefiles --replacepkgs --oldpackage \
-		ftp://dspadm@ftp.jannet.de/pub/packages/linux/suse/10.1/inst-source/rpm/i586/glib2-2.8.5-19.i586.rpm
+		ftp://dspadm@ftp.jannet.de/pub/packages/linux/suse/10.1/rpm/i586/glib2-2.8.5-19.i586.rpm
 	check_ldconfig "$@"
 	;;
 compile_templates|list_templates|list_template_tables|list_template_output|rm_template_output|diff|build_date|built_today|rpmnew)
diff --git a/scripts/pkg.sh b/scripts/pkg.sh
index 5924f04c..f3a07c8b 100644
--- a/scripts/pkg.sh
+++ b/scripts/pkg.sh
@@ -522,7 +522,7 @@ upload_file()
 	}
 	local os_name=`os | sed 's/-.*//'`
 	local os_version=`os | sed 's/[^-]\+-//'`
-	local target_base=rsync_ssh://root@ftp.jannet.de:/srv/ftp/pub/packages/linux/$os_name/$os_version/inst-source
+	local target_base=rsync_ssh://root@ftp.jannet.de:/srv/ftp/pub/packages/linux/$os_name/$os_version
 	[ "$upload_urlbase" ] && target_base="$upload_urlbase"
 	local upload_attrib=644:755:`id -un`.207
 	[ "$upload_file_attrib" ] && upload_attrib="$upload_file_attrib"