diff --git a/.cvsignore b/.cvsignore
index 0006edf..175d859 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -16,3 +16,4 @@ alsa-utils-1.0.14rc2.tar.bz2
 alsa-utils-1.0.14.tar.bz2
 alsa-utils-1.0.15rc1.tar.bz2
 alsa-utils-1.0.16.tar.bz2
+alsa-utils-1.0.17.tar.bz2
diff --git a/alsa-info.sh b/alsa-info.sh
index 1cbd3ee..6639ac3 100644
--- a/alsa-info.sh
+++ b/alsa-info.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-SCRIPT_VERSION=0.4.41
-CHANGELOG="http://hg.alsa-project.org/alsa/log/tip/alsa-info.sh"
+SCRIPT_VERSION=0.4.48
+CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"
 
 #################################################################################
 #Copyright (C) 2007 Free Software Foundation.
@@ -32,8 +32,12 @@ BGTITLE="ALSA-Info v $SCRIPT_VERSION"
 PASTEBINKEY="C9cRIO8m/9y8Cs0nVs0FraRx7U0pHsuc"
 #Define some simple functions
 
+pbcheck(){
+	[[ $(ping -c1 www.pastebin.ca) ]] || KEEP_FILES="yes" NOUPLOAD="yes" PBERROR="yes"
+}
+
 update() {
-	wget -O /tmp/alsa-info.sh http://hg.alsa-project.org/alsa/raw-file/tip/alsa-info.sh >/dev/null 2>&1
+	wget -O /tmp/alsa-info.sh "http://www.alsa-project.org/alsa-info.sh" >/dev/null 2>&1
 	REMOTE_VERSION=`grep SCRIPT_VERSION /tmp/alsa-info.sh |head -n1 |sed 's/.*=//'`
 	if [ "$REMOTE_VERSION" != "$SCRIPT_VERSION" ]; then
 		if [[ -n $DIALOG ]]
@@ -77,11 +81,11 @@ withaplay() {
         echo "" >> $FILE
        	echo "APLAY" >> $FILE
 	echo "" >> $FILE 
-	aplay -l >> $FILE
+	aplay -l >> $FILE 2>&1
         echo "" >> $FILE
        	echo "ARECORD" >> $FILE
 	echo "" >> $FILE
-	arecord -l >> $FILE 
+	arecord -l >> $FILE 2>&1
 	echo "" >> $FILE
 }
 
@@ -102,7 +106,7 @@ withamixer() {
 	CARD_NAME=`grep "^ *$i " /tmp/alsainfo/alsacards.tmp|awk {'print $2'}`
 	echo "!!-------Mixer controls for card $i $CARD_NAME]" >> $FILE
 	echo "" >>$FILE
-	amixer -c$i>> $FILE
+	amixer -c$i>> $FILE 2>&1
         echo "" >> $FILE
 	done
 	echo "" >> $FILE
@@ -190,7 +194,6 @@ SNDOPTIONS=$(modprobe -c|sed -n 's/^options \(snd[-_][^ ]*\)/\1:/p')
 
 QUESTION="yes"
 PROCEED="yes"
-NOUPLOAD=""
 REPEAT=""
 while [ -z "$REPEAT" ]; do
 REPEAT="no"
@@ -215,7 +218,7 @@ done
 if [ "$QUESTION" = "yes" ]; then
 if [[ -n "$DIALOG" ]]
 then
-if [ -z "NOUPLOAD" ]; then
+if [ -z "$NOUPLOAD" ]; then
 	dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nBy default, this script will AUTOMATICALLY UPLOAD your information to a pastebin site.\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
 else
 	dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
@@ -270,7 +273,7 @@ fi
 mkdir $TEMPDIR 2>/dev/null
 
 #Fetch the info and store in temp files/variables
-DISTRO=`grep -ihs "buntu\|SUSE\|Fedora\|PCLinuxOS\|MEPIS\|Mandriva\|Debian\|Damn\|Sabayon\|Slackware\|KNOPPIX\|Gentoo\|Zenwalk\|Mint\|Kubuntu\|FreeBSD\|Puppy\|Freespire\|Vector\|Dreamlinux\|CentOS\|Arch\|Xandros\|Elive\|SLAX\|Red\|BSD\|KANOTIX\|Nexenta\|Foresight\|GeeXboX\|Frugalware\|64\|SystemRescue\|Novell\|Solaris\|BackTrack\|KateOS" /etc/{issue,*release,*version}`
+DISTRO=`grep -ihs "buntu\|SUSE\|Fedora\|PCLinuxOS\|MEPIS\|Mandriva\|Debian\|Damn\|Sabayon\|Slackware\|KNOPPIX\|Gentoo\|Zenwalk\|Mint\|Kubuntu\|FreeBSD\|Puppy\|Freespire\|Vector\|Dreamlinux\|CentOS\|Arch\|Xandros\|Elive\|SLAX\|Red\|BSD\|KANOTIX\|Nexenta\|Foresight\|GeeXboX\|Frugalware\|64\|SystemRescue\|Novell\|Solaris\|BackTrack\|KateOS\|Pardus" /etc/{issue,*release,*version}`
 KERNEL_VERSION=`uname -r`
 KERNEL_PROCESSOR=`uname -p`
 KERNEL_MACHINE=`uname -m`
@@ -411,9 +414,7 @@ then
 	withamixer
 	withalsactl
 	withlsmod
-	#Workaround, while we sort out pastebin location, since pastebin.ca blocked us.
-	#NOUPLOAD="yes"
-	
+	pbcheck	
 fi
 
 fi # proceed
@@ -457,17 +458,6 @@ then
 			withalsactl
 			withlsmod
 			;;
-		#### FIX ME
-		--secure)
-			withdevices
-			withconfigs
-			withaplay
-			withamixer
-			withalsactl
-			withlsmod
-			withsecure
-			;;
-		###########
 		--with-aplay)
 			withaplay
 			;;
@@ -598,7 +588,11 @@ fi
 if [[ -n $DIALOG ]]
 then
 	if [[ -n $NOUPLOAD ]]; then
-		dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "You requested that your information was NOT automatically uploaded to the pastebin\n\nYour ALSA information can be seen by looking in $FILE" 10 100
+		if [[ -n $PBERROR ]]; then
+			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "An error occured while contacting the pastebin. Your information was NOT automatically uploaded.\n\nYour ALSA information can be seen by looking in $FILE" 10 100
+		else
+			dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "You requested that your information was NOT automatically uploaded to the pastebin\n\nYour ALSA information can be seen by looking in $FILE" 10 100
+		fi
 	else
 		dialog --backtitle "$BGTITLE" --title "Information uploaded" --yesno "Would you like to see the uploaded information?" 5 100 
 		DIALOG_EXIT_CODE=$?
@@ -610,10 +604,17 @@ then
 fi 
 clear
 if [[ -n $NOUPLOAD ]]; then
-	echo "You requested that your information was NOT automatically uploaded to the pastebin"
-	echo ""
-	echo "Your ALSA information can be seen by looking in $FILE"
-	echo ""
+	if [[ -n $PBERROR ]]; then
+		echo "An error occured while contacting the pastebin. Your information was NOT automatically uploaded."
+		echo ""
+		echo "Your ALSA information can be seen by looking in $FILE"
+		echo ""
+	else
+		echo "You requested that your information was NOT automatically uploaded to the pastebin"
+		echo ""
+		echo "Your ALSA information can be seen by looking in $FILE"
+		echo ""
+	fi
 fi
 if [[ -z $NOUPLOAD ]]; then
 echo "Your ALSA information is located at $FINAL_URL"
diff --git a/alsa-utils.spec b/alsa-utils.spec
index 1d3379e..7fafc3b 100644
--- a/alsa-utils.spec
+++ b/alsa-utils.spec
@@ -3,8 +3,8 @@
 
 Summary: Advanced Linux Sound Architecture (ALSA) utilities
 Name:    alsa-utils
-Version: 1.0.16
-Release: 3%{?prever_dot}%{?dist}
+Version: 1.0.17
+Release: 1%{?prever_dot}%{?dist}
 License: GPLv2+
 Group:   Applications/Multimedia
 URL:     http://www.alsa-project.org/
@@ -88,6 +88,10 @@ install -p -m 755 %{SOURCE6} $RPM_BUILD_ROOT/usr/bin/alsa-info
 
 
 %changelog
+* Mon Jul 21 2008 Jaroslav Kysela <jkysela@redhat.com> 1.0.17-1
+- updated to 1.0.17 final
+- updated alsa-info.sh script to 0.4.48
+
 * Mon Apr 28 2008 Martin Stransky <stransky@redhat.com> 1.0.16-3
 - Added alsa-info.sh script to /usr/bin/alsa-info
 
diff --git a/sources b/sources
index ca7b5d2..bc8e96e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b9f803f45e6988bb27a6bed521a949fc  alsa-utils-1.0.16.tar.bz2
+14ccd0c900bf663afb36eac6f92d41d6  alsa-utils-1.0.17.tar.bz2