diff --git a/xbps-src/shutils/metadata.sh b/xbps-src/shutils/metadata.sh
index 6bf4ec1d4c2..8508a3f9f5b 100644
--- a/xbps-src/shutils/metadata.sh
+++ b/xbps-src/shutils/metadata.sh
@@ -313,6 +313,8 @@ _EOF
$short_desc
long_desc
$long_desc
+packaged-with
+xbps-src $XBPS_SRC_BUILD_VERSION
_EOF
#
# If package sets $dkms_modules, add dkms rundep.
diff --git a/xbps-src/xbps-src.sh.in b/xbps-src/xbps-src.sh.in
index 87c0793cdc5..3dc3b8d6751 100644
--- a/xbps-src/xbps-src.sh.in
+++ b/xbps-src/xbps-src.sh.in
@@ -23,7 +23,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#-
-
+readonly XBPS_SRC_BUILD_VERSION=20111109
XBPS_CONFIG_FILE=@@XBPS_INSTALL_ETCDIR@@/xbps-src.conf
PROGNAME=$(basename $0)
@@ -227,7 +227,7 @@ check_config_vars()
#
# main()
#
-while getopts "CBc:DhKm:p:Ss:" opt; do
+while getopts "CBc:DhKm:p:Ss:V" opt; do
case $opt in
B) export BUILD_BINPKG=1;;
C) export KEEP_WRKSRC=1;;
@@ -251,6 +251,7 @@ while getopts "CBc:DhKm:p:Ss:" opt; do
;;
S) UNSET_PREFER_BINPKG_DEPS=1;;
s) export XBPS_SRCDISTDIR="$OPTARG";;
+ V) echo $XBPS_SRC_BUILD_VERSION && exit 0;;
--) shift; break;;
esac
done