diff --git a/utils/sh/binpkg-genindex.sh b/utils/sh/binpkg-genindex.sh
new file mode 100644
index 00000000000..c83111dc526
--- /dev/null
+++ b/utils/sh/binpkg-genindex.sh
@@ -0,0 +1,168 @@
+#-
+# Copyright (c) 2008 Juan Romero Pardines.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#-
+
+#
+# These functions write a package index for a repository, with details about
+# all available binary packages.
+#
+write_repo_pkgindex()
+{
+	local propsf=
+	local pkgname=
+	local pkgsum=
+	local pkgindexf=
+	local tmppkgdir=
+	local i=
+
+	[ ! -d $XBPS_PACKAGESDIR ] && exit 1
+
+	pkgindexf=$(mktemp -t pkgidx.XXXXXXXXXX) || exit 1
+	tmppkgdir=$(mktemp -d -t pkgdir.XXXXXXXX) || exit 1
+
+	# Write the header.
+	msg_normal "Creating package index for $XBPS_PACKAGESDIR..."
+	write_repo_pkgindex_header $pkgindexf
+
+	#
+	# Write pkg dictionaries from all packages currently available at
+	# XBPS_PACKAGESDIR.
+	#
+	for i in $(echo $XBPS_PACKAGESDIR/*.xbps); do
+		pkgname="$(basename ${i%%-[0-9]*.*.$xbps_machine.xbps})"
+		propsf="./var/cache/xbps/metadata/$pkgname/props.plist"
+		cd $tmppkgdir && tar xfjp $i $propsf
+		if [ $? -ne 0 ]; then
+			msg_warn "Couldn't extract $i metadata file!"
+			continue
+		fi
+		write_repo_pkgindex_dict $propsf $pkgindexf $(basename $i)
+		if [ $? -ne 0 ]; then
+			msg_warn "Couldn't write $i metadata to index file!"
+			continue
+		fi
+		echo "$(basename $i) added."
+		pkgsum=$(($pkgsum + 1))
+	done
+
+	write_repo_pkgindex_footer $pkgindexf
+	if [ $? -eq 0 ]; then
+		msg_normal "Package index created (total pkgs: $pkgsum)."
+		cp -f $pkgindexf $XBPS_PACKAGESDIR/pkg-index.plist
+	fi
+	rm -f $pkgindexf
+	rm -rf $tmppkgdir
+}
+
+write_repo_pkgindex_header()
+{
+	local file="$1"
+
+	[ -z "$file" ] && return 1
+
+	cat > $file <<_EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>xbps_available_packages/<key>
+	<array>
+_EOF
+}
+
+write_repo_pkgindex_footer()
+{
+	local file="$1"
+
+	[ -z "$file" ] && return 1
+
+	cat >> $file <<_EOF
+	</array>
+</dict>
+</plist>
+_EOF
+}
+
+#
+# Function that writes the package's metadata dictionary into the
+# package index file for a repository. Proper indentation is done
+# as well, thanks to the shell scripting magic :-)
+#
+write_repo_pkgindex_dict()
+{
+	local pkgf="$1"
+	local indexf="$2"
+	local binpkgf="$3"
+	local first_dict=
+	local array_found=
+	local tmpdictf=
+
+	[ -z "$pkgf" -o -z "$indexf" -o -z "$binpkgf" ] && return 1
+
+	tmpdictf=$(mktemp -t pkgdict.XXXXXXXXXX) || exit 1
+
+	cat $pkgf | while read line; do
+		# Find the first dictionary.
+		if $(echo $line|grep -q "<dict>"); then
+			first_dict=yes
+			printf "\t\t$line\n" >> $tmpdictf
+			# Write the binary pkg filename before.
+			printf "\t\t\t<key>filename</key>\n" >> $tmpdictf
+			printf "\t\t\t<string>$binpkgf</string>\n" >> $tmpdictf
+			continue
+		# Continue until found.
+		elif [ -z "$first_dict" ]; then
+			continue
+		# Is this line the end of dictionary?
+		elif $(echo $line|grep -q "</dict>"); then
+			# It is.
+			printf "\t\t$line\n" >> $tmpdictf
+			break
+		# Is this line the start of an array?
+		elif $(echo $line|grep -q "<array>"); then
+			# It is.
+			array_found=yes
+			printf "\t\t\t$line\n" >> $tmpdictf
+			continue
+		# Is this line the end of array?
+		elif $(echo $line|grep -q "</array>"); then
+			# It is.
+			printf "\t\t\t$line\n" >> $tmpdictf
+			unset array_found
+			continue
+		# Print objects inside the dictionary.
+		elif [ -n "$array_found" ]; then
+			# Objects in arrays need an additional tab.
+			printf "\t\t\t\t$line\n" >> $tmpdictf
+			continue
+		else
+			# Normal indentation.
+			printf "\t\t\t$line\n" >> $tmpdictf
+			continue
+		fi
+	done
+
+	cat $tmpdictf >> $indexf
+	rm -f $tmpdictf
+}
diff --git a/xbps.sh b/xbps.sh
index 1ca49dfe67d..b4b68aabce2 100755
--- a/xbps.sh
+++ b/xbps.sh
@@ -49,6 +49,9 @@ Targets:
  configure <pkg>        Configure a package (fetch + extract + configure).
  extract <pkg>          Extract distribution file(s) into build directory.
  fetch <pkg>            Download distribution file(s).
+ genindex               Generate a package index for a directory containing
+                        binary packages. This uses the XBPS_PACKAGESDIR option
+                        in the configuration file.
  info <pkg>             Show information about <pkg>.
  install-destdir <pkg>  build + install into destdir.
  install <pkg>          install-destdir + stow.
@@ -257,6 +260,10 @@ extract|fetch|info)
 	. $XBPS_SHUTILSDIR/extract_funcs.sh
 	extract_distfiles $2
 	;;
+genindex)
+	. $XBPS_SHUTILSDIR/binpkg-genindex.sh
+	write_repo_pkgindex
+	;;
 install|install-destdir)
 	[ -z "$2" ] && msg_error "missing package name after target."
 	[ "$target" = "install-destdir" ] && install_destdir_target=yes