diff --git a/bash_completion b/bash_completion
index c4128f30..b1c59f56 100644
--- a/bash_completion
+++ b/bash_completion
@@ -2,7 +2,7 @@
 #
 #   <![CDATA[
 #
-#   $Id: bash_completion,v 1.82 2002/02/03 22:01:43 ianmacd Exp $
+#   $Id: bash_completion,v 1.83 2002/02/04 03:12:10 ianmacd Exp $
 #
 #   Copyright (C) Ian Macdonald <ian@caliban.org>
 #
@@ -1589,6 +1589,67 @@ _zip()
 }
 [ "$have" ] && complete -F _zip -o filenames gzip bzip2
 
+# openssl(1) completion
+#
+have openssl &&
+_openssl()
+{
+	local cur
+
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+
+	if [ $COMP_CWORD = 1 ]; then
+		COMPREPLY=( $( compgen -W 'asn1parse ca ciphers crl crl2pkcs7 \
+			dgst dh dhparam dsa dsaparam enc errstr gendh gendsa \
+			genrsa nseq passwd pkcs12 pkcs7 pkcs8 rand req rsa \
+			rsautl s_client s_server s_time sess_id smime speed \
+			spkac verify version x509 md2 md4 md5 mdc2 rmd160 sha \
+			sha1 base64 bf bf-cbc bf-cfb bf-ecb bf-ofb cast \
+			cast-cbc cast5-cbc cast5-cfb cast5-ecb cast5-ofb des \
+			des-cbc des-cfb des-ecb des-ede des-ede-cbc \
+			des-ede-cfb des-ede-ofb des-ede3 des-ede3-cbc \
+			des-ede3-cfb des-ede3-ofb des-ofb des3 desx rc2 \
+			rc2-40-cbc rc2-64-cbc rc2-cbc rc2-cfb rc2-ecb rc2-ofb \
+			rc4 rc4-40' $cur ) )
+        fi
+
+        return 0
+}
+[ $have ] && complete -F _openssl -o default openssl
+
+# screen(1) completion
+#
+have screen &&
+_screen()
+{
+	local cur prev
+
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+	prev=${COMP_WORDS[COMP_CWORD-1]}
+
+	case "$prev" in
+	-[rR])
+		# list detached
+		COMPREPLY=( $( \screen -ls | sed -ne 's/^['$'\t'']\+\('$cur'[^'$'\t'']\+\).*Detached.*$/\1/p' ) )
+		;;
+	-[dDx])
+		# list attached
+		COMPREPLY=( $( \screen -ls | sed -ne 's/^['$'\t'']\+\('$cur'[^'$'\t'']\+\).*Attached.*$/\1/p' ) )
+		;;
+	-s)
+		# shells
+		COMPREPLY=( $( grep ^$cur /etc/shells ) )
+		;;
+	*)
+		;;
+        esac
+
+        return 0
+}
+[ $have ] && complete -F _screen -o default screen
+
 _expand()
 {
 	# expand ~username type directory specifications