diff --git a/common/libc.sh b/common/libc.sh
index 042d6f4..16607b5 100644
--- a/common/libc.sh
+++ b/common/libc.sh
@@ -45,59 +45,84 @@ dump_bin_sh() {
   fi
 }
 
-process_libc() {
-  local libc=$1
+process_lib() {
+  local lib=$1
   local id=$2
   local info=$3
   local url=$4
-  echo "  -> Writing libc ${libc} to db/${id}.so"
-  cp $libc db/${id}.so
-  echo "  -> Writing symbols to db/${id}.symbols"
-  (dump_symbols $libc; dump_libc_start_main_ret $libc; dump_bin_sh $libc) \
-     > db/${id}.symbols
+  echo "  -> Writing binary $lib to db/${id}/"
+  mkdir -p db/${id}/
+  cp $lib db/${id}/$(basename $lib)
+  if [[ $lib =~ .*libc[-_\.][0-9\._a-zA-Z]*\.so.* ]]; then
+    echo "  -> Writing symbols to db/${id}/"
+    (dump_symbols $lib; dump_libc_start_main_ret $lib; dump_bin_sh $lib)  > db/${id}/"$(basename $lib)".symbols
+  fi
+
+  [[ -f "db/${id}/info" ]] && return
+
   echo "  -> Writing version info"
-  echo "$info" > db/${id}.info
-  echo "$url" > db/${id}.url
+  echo "$info" > db/${id}/info
+  echo "$url" > db/${id}/url
 }
 
-index_libc() {
+process_debug() {
+  local lib=$1
+  local id=$2
+
+  echo "  -> Writing libc debug symbols to db/${id}/.debug/"
+  mkdir -p db/${id}/.debug
+  cp $lib db/${id}/.debug/$(basename $lib)
+}
+
+index_libs() {
   local tmp="$1"
   local id="$2"
   local info="$3"
   local url="$4"
-  suffix=
-  cnt=1
   # Sometimes, the real libc.so is not matched with `libc.so*`.
-  libs=$(find "$tmp" -name 'libc.so*';find "$tmp" -name 'libc[-_.][a-z]*.so*')
-  [[ -z "$libs" ]] && die "Cannot locate the libc file"
-  for libc in $libs; do
+  libs=$(find "$tmp" -name '*.so*' | grep -v ".conf")
+  [[ -z "$libs" ]] && die "Cannot locate any library file"
+  for lib in $libs; do
     # Some file matched can be ASCII files instead :(
-    if ! (file "$libc" | grep -q 'ELF\|symbolic link to') ; then
-      echo "  -> libc ${libc} is not an ELF file"
+    if ! (file "$lib" | grep -q 'ELF\|symbolic link to') ; then
+      echo "  -> library ${lib} is not an ELF file"
       continue  # Keep cnt and suffix as it
     fi
-    process_libc "$libc" "$id$suffix" "$info" "$url"
-    cnt=$((cnt+1))
-    suffix=_$cnt
+	process_lib "$lib" "$id" "$info" "$url"
+  done
+}
+
+index_debug() {
+  local tmp="$1"
+  local id="$2"
+  libs=$(find "$tmp" -name '*.so*' | grep -v ".conf")
+  # Usually, find's order is the same as libc one.
+  if [[ -z "$libs" ]]; then
+    echo "  -> Cannot locate any debug file. Skipping"
+	return
+  fi
+  for lib in $libs; do
+  	process_debug "$lib" "$id"
   done
 }
 
 check_id() {
   local id=$1
-  if [[ -e db/${id}.info ]]; then
-    echo "  -> Already have this version, 'rm ${PWD}/db/${id}.*' to force"
+  if [[ -d db/${id} ]]; then
+    echo "  -> Already have this version, 'rm -rf ${PWD}/db/${id}' to force"
     return 1
   fi
   return 0
 }
 
 requirements_general() {
-  which readelf 1>/dev/null 2>&1 || return
-  which perl    1>/dev/null 2>&1 || return
-  which objdump 1>/dev/null 2>&1 || return
-  which strings 1>/dev/null 2>&1 || return
-  which find    1>/dev/null 2>&1 || return
-  which grep    1>/dev/null 2>&1 || return
+  which readelf  1>/dev/null 2>&1 || return
+  which perl     1>/dev/null 2>&1 || return
+  which objdump  1>/dev/null 2>&1 || return
+  which strings  1>/dev/null 2>&1 || return
+  which find     1>/dev/null 2>&1 || return
+  which grep     1>/dev/null 2>&1 || return
+  which basename 1>/dev/null 2>&1 || return
   return 0
 }
 
@@ -128,7 +153,48 @@ get_debian() {
     tar xf data.tar.* || die "tar failed"
   fi
   popd 1>/dev/null
-  index_libc "$tmp" "$id" "$info" "$url"
+  index_libs "$tmp" "$id" "$info" "$url"
+  rm -rf $tmp
+}
+
+get_debian_debug_symbols() {
+  local url=$1
+  local origin=$2
+  local info=$3
+  local pkgname=$4
+  local tmp=`mktemp -d`
+  echo "Getting debug symbols of $info"
+  echo "  -> Location: $url"
+  local id=`echo $origin | perl -n -e '/('"$pkgname"'[^\/]*)\./ && print $1'`
+  echo "  -> ID: $id"
+  echo "  -> Downloading debug symbol"
+  if ! wget "$url" 2>/dev/null -O $tmp/pkg.deb; then
+    echo >&2 "Failed to download debug symbol from $url. Skipping"
+	return
+  fi
+  echo "  -> Extracting debug symbol"
+  pushd $tmp 1>/dev/null
+  if ! ar x pkg.deb; then
+    echo >&2"ar failed. Skipping"
+	return
+  fi
+  if [ -f data.tar.zst ]; then
+    if ! zstd -d data.tar.zst; then
+	  echo >&2 "zstd failed. Skipping"
+	  return
+	fi
+    if ! tar xf data.tar; then
+	  echo >&2 "tar failed, Skipping"
+	  return
+	fi
+  else
+    if ! tar xf data.tar.*; then
+	  echo >&2 "tar failed, Skipping"
+	  return
+	fi
+  fi
+  popd 1>/dev/null
+  index_debug $tmp $id
   rm -rf $tmp
 }
 
@@ -138,6 +204,8 @@ get_all_debian() {
   local pkgname=$3
   for f in `wget $url/ -O - 2>/dev/null | grep -Eoh "$pkgname"'(-i386|-amd64|-x32)?_[^"]*(amd64|i386)\.deb' |grep -v "</a>"`; do
     get_debian "$url/$f" "$info" "$pkgname"
+    local debugfile=$(echo $f | sed -r "s/$pkgname(-i386|-amd64|-x32)?/$pkgname-dbg/g")
+	get_debian_debug_symbols "$url/$debugfile" "$url/$f" "$info" "$pkgname"
   done
   return 0
 }
@@ -150,6 +218,7 @@ requirements_debian() {
   which tar    1>/dev/null 2>&1 || return
   which grep   1>/dev/null 2>&1 || return
   which zstd   1>/dev/null 2>&1 || return
+  which sed    1>/dev/null 2>&1 || return
   return 0
 }
 
@@ -175,13 +244,38 @@ get_rpm() {
   (rpm2cpio pkg.rpm || die "rpm2cpio failed") | \
     (cpio -id --quiet || die "cpio failed")
   popd 1>/dev/null
-  index_libc "$tmp" "$id" "$info" "$url"
+  index_libs "$tmp" "$id" "$info" "$url"
+  rm -rf "$tmp"
+}
+
+get_rpm_debug_symbols() {
+  local url="$1"
+  [[ -z $(echo "$url" | sed -r "s/\s*$//g" | sed -r "s/^\s*//g" ) ]] && return
+  local origin="$2"
+  local info="$3"
+  local pkgname="$4"
+  local tmp="$(mktemp -d)"
+  echo "Getting debug symbols of $info"
+  echo "  -> Location: $url"
+  local id=$(echo "$origin" | perl -n -e '/('"$pkgname"'[^\/]*)\./ && print $1')
+  echo "  -> ID: $id"
+  echo "  -> Downloading debug symbol"
+  if ! wget --no-dns-cache --connect-timeout=30 "$url" 2>/dev/null -O "$tmp/pkg.rpm"; then
+    echo >&2 "Failed to download debug symbol from $url. It seems that $id does not have a debug symbol. Do not worry"
+	return
+  fi
+  echo "  -> Extracting debug symbol"
+  pushd "$tmp" 1>/dev/null
+  rpm2cpio pkg.rpm | cpio -id --quiet
+  popd 1>/dev/null
+  index_debug "$tmp" "$id"
   rm -rf "$tmp"
 }
 
 get_all_rpm() {
   local info=$1
   local pkg=$2
+  local pkgdebug=$pkg-debuginfo
   local pkgname=$3
   local arch=$4
   local website="http://rpmfind.net"
@@ -195,15 +289,39 @@ get_all_rpm() {
     echo "Retrying..."
     sleep 1
   done
+  local debugsearchurl="$website/linux/rpm2html/search.php?query=$pkgdebug"
+  echo "Getting debug RPM package location: $info $pkgdebug $pkgname $arch"
+  for i in $(seq 1 3); do
+    dbgurls=$(wget "$debugsearchurl" -O - 2>/dev/null \
+	  | grep -oh "/[^']*${pkgname}[^']*\.$arch\.rpm")
+	[[ -z "$dbgurls" ]] || break
+	echo "Retrying..."
+	sleep 1
+  done
 
   if ! [[ -n "$urls" ]]; then
     echo >&2 "Failed to get RPM package URL for $info $pkg $pkgname $arch"
     return
   fi
+  declare -A rpmdebugs
+  if [[ -n "$dbgurls" ]]; then
+    echo "Building rpm & debug package mappings"
+    for original in $urls; do
+	  local currentpkgname=$(basename $original)
+	  local debugpkgname=$(echo $currentpkgname | sed 's/'$pkg'/'$pkgdebug'/g')
+	  for debug in $dbgurls; do
+	    if [[ -z $(echo $debug | grep "$debugpkgname") ]]; then
+		  continue
+		fi
+		rpmdebugs[$original]=$website$debug
+	  done
+	done
+  fi
 
   for url in $urls
   do
     get_rpm "$website$url" "$info" "$pkgname"
+	get_rpm_debug_symbols "${rpmdebugs[$url]}" "$website$url" "$info" "$pkgname"
     sleep .1
   done
 }
@@ -212,7 +330,7 @@ requirements_rpm() {
   which mktemp   1>/dev/null 2>&1 || return
   which perl     1>/dev/null 2>&1 || return
   which wget     1>/dev/null 2>&1 || return
-  which rpm2cpio || return
+  which rpm2cpio 1>/dev/null 2>&1 || return
   which cpio     1>/dev/null 2>&1 || return
   which grep     1>/dev/null 2>&1 || return
   return 0
@@ -225,6 +343,7 @@ get_from_filelistgz() {
   local website=$2
   local pkg=$3
   local arch=$4
+  local debugwebsite=$5
   echo "Getting package $pkg locations"
   local url=""
   for i in $(seq 1 3); do
@@ -237,9 +356,18 @@ get_from_filelistgz() {
     sleep 1
   done
   [[ -n "$urls" ]] || die "Failed to get package version"
+
   for url in $urls
   do
     get_rpm "$website/$url" "$info" "$pkg"
+	local slices=(${url//\// })
+	local systemver=${slices[1]}
+	local verslices=(${systemver//\./ })
+	local major=${verslices[0]}
+
+	local debugname=$(echo $url | sed "s/updates//g" | sed "s/BaseOS//g" | sed "s/glibc/glibc-debuginfo/g" | sed -r "s/[0-9]+\.[0-9]+\.[0-9]+/$major/g" | sed "s/\/os//g" | sed "s/\/Packages//g")
+	echo $debugname
+	get_rpm_debug_symbols "$debugwebsite/$debugname" "$website/$url" "$info" "$pkg"
     sleep .1
   done
 }
@@ -248,6 +376,7 @@ requirements_centos() {
   which wget       1>/dev/null 2>&1 || return
   which gzip       1>/dev/null 2>&1 || return
   which grep       1>/dev/null 2>&1 || return
+  which sed        1>/dev/null 2>&1 || return
   requirements_rpm || return
   return 0
 }
@@ -284,14 +413,103 @@ get_pkg() {
     tar xJf pkg.tar.xz --warning=none
   fi
   popd 1>/dev/null
-  index_libc "$tmp" "$id" "$info" "$url"
+  index_libs "$tmp" "$id" "$info" "$url"
   rm -rf "$tmp"
 }
 
+get_pkg_debug() {
+  local info=$1
+  local original=$2
+  local pkgname=$3
+  local debugname=$4
+  local tmp="$(mktemp -d)"
+  echo "Getting debug symbol of "$pkgname
+
+  local id=$(echo "$original" | perl -n -e '/('"$pkgname"'[^\/]*)\.pkg\.tar\.(xz|zst)/ && print $1' | ( (echo "$original" | grep -q 'lib32') && sed 's/x86_64/x86/g' || cat))
+  local idslices=(${id//\-/ })
+  local version=${idslices[1]}
+  local pkgrel=${idslices[2]}
+  local arch=${idslices[3]}
+
+  pushd $tmp 1>/dev/null
+  # https://github.com/pwndbg/pwndbg/issues/340#issuecomment-431254792
+  echo "  -> Initializing svn repository"
+  if ! svn checkout --depth=empty svn://svn.archlinux.org/packages pkgs 1>/dev/null 2>&1; then
+    echo >&2 "Could not initialize the svn repository. Skipping"
+	popd 1>/dev/null
+	return
+  fi
+  pushd pkgs 1>/dev/null
+  if ! svn update $debugname 1>/dev/null 2>&1; then
+    echo >&2 "Could not checkout "$debugname". Skipping"
+	popd 1>/dev/null
+	popd 1>/dev/null
+	return
+  fi
+
+  pushd $debugname/repos/core-x86_64 1>/dev/null
+  echo "  -> Checking version"
+  local repoverraw=$(cat PKGBUILD | grep "pkgver")
+  local repoverslices=(${repoverraw//\=/ })
+  local repover=${repoverslices[1]}
+
+  local repopkgrelraw=$(cat PKGBUILD | grep "pkgrel")
+  local repopkgrelslices=(${repopkgrelraw//\=/ })
+  local repopkgrel=${repopkgrelslices[1]}
+
+  if [[ "$repover" != "$version" || "$pkgrel" != "$repopkgrel" ]] ; then
+    echo "  -> Version mismatches, package one is $version-$pkgrel and the other one is $repover-$repopkgrel. Skipping"
+	popd 1>/dev/null
+	popd 1>/dev/null
+	return
+  fi
+  
+  echo "  -> Replacing PKGBUILD file"
+  if ! sed -i "s#!strip#debug#" PKGBUILD 1>/dev/null 2>&1; then
+    echo >&2 "Could not replace PKGBUILD file. Skipping"
+  fi
+  echo "  -> Started building $id"
+  if ! makepkg --skipchecksums --nocheck 1>/dev/null 2>&1; then
+    echo >&2 "Could not build $id. Skipping"
+    popd 1>/dev/null
+    popd 1>/dev/null
+    popd 1>/dev/null
+	return
+  fi
+  echo "  -> Cleaning up the work environment"
+  find . -type d -exec rm -rf {} \; 1>/dev/null 2>&1
+  echo "  -> Extracting built package"
+  local debugpkg=$(ls | grep "debug" | grep ".tar.")
+  if (echo "$debugpkg" | grep -q '\.zst')
+  then
+    zstd -dq $debugpkg -o pkg.tar
+    tar xf pkg.tar --warning=none
+  fi
+  if (echo "$url" | grep -q '\.xz')
+  then
+    tar xJf $debugpkg --warning=none
+  fi
+
+  echo "  -> Removing unneeded symbols"
+  if grep -q "x86_64" <<< "$arch"; then
+    find usr/lib/debug -name "lib32" -type d -exec rm -rf {} \; 1>/dev/null 2>&1
+  else
+    find usr/lib/debug -name "lib" -type d -exec rm {} \; 1>/dev/null 2>&1
+  fi
+
+  popd 1>/dev/null
+  popd 1>/dev/null
+  popd 1>/dev/null
+
+  index_debug $tmp $id
+  rm -rf $tmp
+}
+
 get_all_pkg() {
   local info=$1
   local directory=$2
   local pkgname=$3
+  local debugname=$4
   echo "Getting package $info locations"
   local url=""
   for i in $(seq 1 3); do
@@ -308,19 +526,24 @@ get_all_pkg() {
   do
     get_pkg "$directory/$url" "$info" "$pkgname"
     sleep .1
+	[[ -z $debugname ]] && die 1
+	get_pkg_debug "$info" "$directory/$url" "$pkgname" "$debugname"
+	sleep 1
   done
 }
 
 requirements_pkg() {
-  which mktemp 1>/dev/null 2>&1 || return
-  which perl   1>/dev/null 2>&1 || return
-  which grep   1>/dev/null 2>&1 || return
-  which sed    1>/dev/null 2>&1 || return
-  which cat    1>/dev/null 2>&1 || return
-  which wget   1>/dev/null 2>&1 || return
-  which zstd   1>/dev/null 2>&1 || return
-  which tar    1>/dev/null 2>&1 || return
-  which xz     1>/dev/null 2>&1 || return
+  which mktemp  1>/dev/null 2>&1 || return
+  which perl    1>/dev/null 2>&1 || return
+  which grep    1>/dev/null 2>&1 || return
+  which sed     1>/dev/null 2>&1 || return
+  which cat     1>/dev/null 2>&1 || return
+  which wget    1>/dev/null 2>&1 || return
+  which zstd    1>/dev/null 2>&1 || return
+  which tar     1>/dev/null 2>&1 || return
+  which xz      1>/dev/null 2>&1 || return
+  which svn     1>/dev/null 2>&1 || return
+  which makepkg 1>/dev/null 2>&1 || return
   return 0
 }
 
@@ -346,7 +569,31 @@ get_apk() {
   pushd $tmp 1>/dev/null
   tar xzf pkg.tar.gz --warning=none
   popd 1>/dev/null
-  index_libc "$tmp" "$id" "$info" "$url"
+  index_libs "$tmp" "$id" "$info" "$url"
+  rm -rf $tmp
+}
+
+get_apk_debug() {
+  local url=$1
+  local original=$2
+  local info="$2"229
+  local pkgname="$3"
+  local tmp=$(mktemp -d)
+
+  echo "Getting debug symbols of $info"
+  echo "  -> Location: $url"
+  local id=$(echo "$original" | perl -n -e '/('"$pkgname"'[^\/]*)\.apk/ && print $1')
+  echo "  -> ID: $id"
+  echo "  -> Downloading debug symbol"
+  if ! wget "$url" 2>/dev/null -O "$tmp/pkg.tar.gz"; then
+    echo >&2 "Failed to download debug symbol from $url. Skipping"
+	return
+  fi
+  echo "  -> Extracting debug symbol"
+  pushd $tmp 1>/dev/null
+  tar xzf pkg.tar.gz --warning=none
+  popd 1>/dev/null
+  index_debug "$tmp" "$id"
   rm -rf $tmp
 }
 
@@ -373,6 +620,8 @@ get_all_apk() {
   for url in $urls
   do
     get_apk "$directory$url" "$info" "$pkgname"
+	local debugurl=$(echo $f | sed -r "s/$pkgname/$pkgname-dbg/g")
+	get_apk_debug "$directory$debugurl" "$directory$url" "$info" "$pkgname"
     sleep .1
   done
 }
@@ -382,8 +631,9 @@ requirements_apk() {
   which perl   1>/dev/null 2>&1 || return
   which wget   1>/dev/null 2>&1 || return
   which tar    1>/dev/null 2>&1 || return
-  which gzip    1>/dev/null 2>&1 || return
+  which gzip   1>/dev/null 2>&1 || return
   which grep   1>/dev/null 2>&1 || return
+  which sed    1>/dev/null 2>&1 || return
   return 0
 }
 
@@ -401,11 +651,14 @@ get_all_launchpad() {
     echo "Launchpad: Series $series"
     local apiurl="https://api.launchpad.net/1.0/$distro/+archive/primary?ws.op=getPublishedBinaries&binary_name=$pkgname&exact_match=true&distro_arch_series=https://api.launchpad.net/1.0/$distro/$series/$arch"
     local url=""
+	local dbgurl=""
     urls=$(wget "$apiurl" -O - 2>/dev/null | jq '[ .entries[] | .build_link + "/+files/" + .binary_package_name + "_" + .source_package_version + "_" + (.distro_arch_series_link | split("/") | .[-1]) + ".deb" | ltrimstr("https://api.launchpad.net/1.0/") | "https://launchpad.net/" + . ] | unique | .[]')
     for url in $urls; do
       url=$(echo $url | grep -Eo '[^"]+')
       # some old packages are deleted. ignore those.
       get_debian "$url" "$info-$series" "$pkgname"
+	  dbgurl=$(echo $url | sed "s/$pkgname/$pkgname-dbg/g")
+	  get_debian_debug_symbols "$dbgurl" "$url" "$info-$series" "$pkgname"
     done
   done
 }
@@ -425,10 +678,11 @@ add_local() {
   local id="local-`sha1sum $libc`"
   echo "Adding local libc $libc (id $id)"
   check_id $id || return
-  process_libc $libc $id $info
+  process_lib $libc $id $info
 }
 
 requirements_local() {
   which sha1sum 1>/dev/null 2>&1 || return
   return 0
 }
+
diff --git a/dump b/dump
index 6aea727..27189c9 100755
--- a/dump
+++ b/dump
@@ -12,9 +12,16 @@ if [[ $# == 0 ]]; then
 else
   names="$@"
 fi
-ls -1 "db/${id}."* >/dev/null 2>&1 || die "Invalid ID '$id'"
+
+ls -1 "db/${id}" >/dev/null 2>&1 || die "Invalid ID '$id'"
 for name in $names; do
-  offset=`cat db/${id}.symbols | grep "^$name " | cut -d' ' -f2`
-  [ -z "$offset" ] && die "Invalid symbol '$name'"
-  echo "offset_${name} = 0x${offset}"
+  found=0
+  ls db/${id}/*.symbols | while read file; do
+    offset=`cat $file | grep "^$name " | cut -d ' ' -f2`
+	[ -z "$offset" ] && continue
+	echo "offset_$name in " ${id::-7}.so = "0x${offset}"
+	found=1
+  done
+  [ -z $found ] && die "No symbol $name found in libraries."
 done
+
diff --git a/find b/find
index 61becc3..e09deb3 100755
--- a/find
+++ b/find
@@ -9,8 +9,8 @@ function find_single() {
   name=$1
   address=$2
   addr_last12=`echo -n "$address" | tail -c 3`
-  grep -i -e "^$name .*$addr_last12$" db/*.symbols \
-    | perl -n -e '/db\/(.*)\.symbols/ && print "$1\n"' \
+  grep -i -e "^$name .*$addr_last12$" db/*/*.symbols \
+    | perl -n -e '/db\/(.*)\/.*\.symbols/ && print "$1\n"' \
     | sort
 }
 
@@ -29,7 +29,7 @@ function find() {
 
 ret=1
 for id in `find "$@"`; do
-  echo "`cat db/${id}.info` ($id)"
+  echo "`cat db/${id}/info` ($id)"
   ret=0
 done
 exit $ret
diff --git a/get b/get
index e3e3ffd..1517d7f 100755
--- a/get
+++ b/get
@@ -49,16 +49,16 @@ categories[cntr_category]="centos"
 requirements["centos"]="requirements_centos"
 cntr_category=$((cntr_category + 1))
 centos() {
-  get_from_filelistgz centos-glibc http://mirror.centos.org/centos/ glibc i686
-  get_from_filelistgz centos-glibc http://mirror.centos.org/centos/ glibc x86_64
+  get_from_filelistgz centos-glibc http://mirror.centos.org/centos/ glibc i686 http://debuginfo.centos.org/ 
+  get_from_filelistgz centos-glibc http://mirror.centos.org/centos/ glibc x86_64 http://debuginfo.centos.org/ 
 }
 
 categories[cntr_category]="arch"
 requirements["arch"]="requirements_pkg"
 cntr_category=$((cntr_category + 1))
 arch() {
-  get_all_pkg arch-glibc https://archive.archlinux.org/packages/g/glibc/ libc
-  get_all_pkg arch-lib32-glibc https://archive.archlinux.org/packages/l/lib32-glibc/ libc
+  get_all_pkg arch-glibc https://archive.archlinux.org/packages/g/glibc/ libc glibc
+  get_all_pkg arch-lib32-glibc https://archive.archlinux.org/packages/l/lib32-glibc/ libc glibc
   get_all_pkg arch-musl https://archive.archlinux.org/packages/m/musl/ musl
 }
 
@@ -152,3 +152,4 @@ for category in "$@" ; do
   echo "Downloading/updating $category"
   $category
 done
+
diff --git a/identify b/identify
index 3be7cb9..9e5d98c 100755
--- a/identify
+++ b/identify
@@ -50,4 +50,5 @@ case "$arg" in
     help
 esac
 
-ls -1 db/*.so | xargs $tool | grep -- "$regex" | perl -n -e '/([^\/: ]+)\.so/&&print "$1\n"'
+ls -1 db/*/*.so | xargs $tool | grep -- "$regex" | perl -n -e '/([^\/: ]+)\.so/&&print "$1\n"'
+
diff --git a/patch b/patch
new file mode 100755
index 0000000..b0ca13a
--- /dev/null
+++ b/patch
@@ -0,0 +1,70 @@
+#!/bin/bash
+
+patch_requirements() {
+  which realpath 1>/dev/null 2>&1 || return
+  which patchelf 1>/dev/null 2>&1 || return
+  return 0
+}
+
+if [[ $# -ne 2 ]]; then
+  echo >&2 "Usage: $# id elf [interpreter_choice] [libc_choice]"
+  exit 2
+fi
+
+id=$1
+targetelf=$(realpath $2)
+ldchoice=$3
+libcchoice=$4
+
+cd "$(dirname $0)"
+. common/libc.sh
+
+if ! patch_requirements ; then
+  die "Patching requires both realpath and patchelf to work"
+fi
+
+ls -1 "db/${id}" >/dev/null 2>&1 || die "Invalid ID '$id'"
+
+interpreters=($(find "db/${id}" -name "ld[-_\.][a-zA-Z0-9\.-_]*\.so*" | grep -v "debug"))
+[[ -z "$interpreters" ]] && die "Cannot locate any ld.so"
+choseninterpreter=""
+interpretersamount=${#interpreters[@]}
+if [[ -z $ld_choice ]]; then
+  if [[ $interpretersamount -eq 1 ]]; then
+    ldchoice=0
+  else
+    echo "There are multiple interpreters found."
+    for i in "${!interpreters[@]}"; do
+      echo "[$i] -> ${interpreters[$i]}"
+    done
+    echo "Your choice (type any other words to quit):"
+    read ldchoice
+  fi
+fi
+choseninterpreter=${interpreters[$ldchoice]}
+if ! (file $choseninterpreter | grep -q "ELF\|symbolic link to"); then
+  die "Unknown interpreter"
+fi
+
+libcs=($(find "db/${id}" -name "libc[-_\.][a-zA-Z0-9\._-]*\.so*" | grep -v "debug"))
+chosenlibc=""
+libcamount=${#libcs[@]}
+if [[ -z $libc_choice ]]; then
+  if [[ $libcamount -eq 1 ]]; then
+    libcchoice=0
+  else
+    echo "There are multiple C libraries found."
+	for i in "${!libcs[@]}"; do
+	  echo "[$i] -> ${libcs[$i]}"
+	done
+	echo "Your choice (type any other words to quit):"
+	read libcchoice
+  fi
+fi
+chosenlibc=${libcs[$libcchoice]}
+if ! (file $chosenlibc | grep -q "ELF\|symbolic link to"); then
+  die "Unknown libc"
+fi
+
+patchelf --set-interpreter $(realpath $choseninterpreter) --replace-needed libc.so.6 $(realpath $chosenlibc) $targetelf 2>&1 1>/dev/null && echo "ELF patched" || echo "ELF patching failed"
+