diff --git a/contrib/angstrom/angstrom.png b/contrib/angstrom.png
similarity index 100%
rename from contrib/angstrom/angstrom.png
rename to contrib/angstrom.png
diff --git a/contrib/angstrom/angstrom.svg b/contrib/angstrom.svg
similarity index 100%
rename from contrib/angstrom/angstrom.svg
rename to contrib/angstrom.svg
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/build-feeds.sh
similarity index 100%
rename from contrib/angstrom/build-feeds.sh
rename to contrib/build-feeds.sh
diff --git a/contrib/angstrom/build-release.sh b/contrib/build-release.sh
similarity index 100%
rename from contrib/angstrom/build-release.sh
rename to contrib/build-release.sh
diff --git a/contrib/angstrom/extract-feedarch.sh b/contrib/extract-feedarch.sh
similarity index 100%
rename from contrib/angstrom/extract-feedarch.sh
rename to contrib/extract-feedarch.sh
diff --git a/contrib/angstrom/local.conf b/contrib/local.conf
similarity index 100%
rename from contrib/angstrom/local.conf
rename to contrib/local.conf
diff --git a/contrib/angstrom/omap3-mkcard.sh b/contrib/omap3-mkcard.sh
similarity index 100%
rename from contrib/angstrom/omap3-mkcard.sh
rename to contrib/omap3-mkcard.sh
diff --git a/contrib/angstrom/personal-feed.sh b/contrib/personal-feed.sh
similarity index 100%
rename from contrib/angstrom/personal-feed.sh
rename to contrib/personal-feed.sh
diff --git a/contrib/angstrom/rss.php b/contrib/rss.php
similarity index 100%
rename from contrib/angstrom/rss.php
rename to contrib/rss.php
diff --git a/contrib/angstrom/sort.sh b/contrib/sort.sh
similarity index 69%
rename from contrib/angstrom/sort.sh
rename to contrib/sort.sh
index 3364ac3..3baac89 100755
--- a/contrib/angstrom/sort.sh
+++ b/contrib/sort.sh
@@ -54,15 +54,34 @@ case "$arch" in
 	"armv4t")
 			machines="acern30 amsdelta at2440evb cs-e9302 ep93xx eteng500 eten-m800 fic-gta01 fic-gta02 gesbc-9302 h1940 h6300 kb9202 ks8695 m8050 micro2440 mini2440 om-gta01 om-gta02 rx1950 rx3000 sarge-at91 simone smdk2440 smdk2443 topas910 ts72xx" ;;
 	"armv5te")
-			machines="a1200 a780 a910 afeb9260 afeb9260-180 akita asus620 asus730 at91cap9adk at91-l9260 at91sam9260ek at91sam9261ek at91sam9263ek at91sam9g10ek at91sam9g20ek at91sam9g45ek at91sam9g45ekes at91sam9rlek aximx50 aximx50v bd-neon c7x0 chumby chumby-falconwing cm-x270 cm-x300 da830-omapl137-evm da850-omapl138-evm davinci-dvevm davinci-sffsdr devkitidp-pxa255 dm355-evm dm355-leopard dm357-evm dm365-evm dm6446-evm dm6467-evm dm6467t-evm dns323 dockstar e680 ea3250 em-x270 er0100 eseries ghi270 gumstix gumstix-connex gumstix-custom-connex gumstix-custom-verdex gumstix-verdex h1910 h2200 h3900 h4000 h5000 hawkboard hipox htcalpine htcapache htcblueangel htchimalaya htcsable htctornado htcuniversal hx2000 hx4700 imote2 ixp4xxle kixrp435 kuropro logicpd-pxa270 looxc550 lspro magician mainstone mh355 mp900c mtx-3 mtx-3a mv2120 mx21ads mx27ads n2100 navman-icn330 netbook-pro neuros-osd neuros-osd2 nhk15 nokia770 nslu2le omap1510inn omap1610h2 omap1710h3 omap5912osk openrd-base openrd-client palmld palmt650 palmt680 palmtc palmtt palmtt3 palmtt5 palmtx palmz31 palmz71 palmz72 poodle qemuarm rokre2 rokr-e2 rokre6 ronetix-pm9261 ronetix-pm9263 sgh-i900 sheevaplug spitz stamp9g20evb topas910 tosa triton ts409 tsx09 tx25 tx27" ;;
+			machines="a1200 a780 a910 afeb9260 afeb9260-180 akita am180x-evm
+ asus620 asus730 at91cap9adk at91-l9260 at91sam9260ek at91sam9261ek
+ at91sam9263ek at91sam9g10ek at91sam9g20ek at91sam9g45ek at91sam9g45ekes
+ at91sam9rlek aximx50 aximx50v bd-neon c7x0 chumby chumby-falconwing cm-x270
+ cm-x300 da830-omapl137-evm da850-omapl138-evm davinci-dvevm davinci-sffsdr
+ devkitidp-pxa255 dm355-evm dm355-leopard dm357-evm dm365-evm dm368-evm
+ dm6446-evm dm6467-evm dm6467t-evm dns323 dockstar e680 ea3250 em-x270 er0100
+ eseries ghi270 gumstix gumstix-connex gumstix-custom-connex
+ gumstix-custom-verdex gumstix-verdex h1910 h2200 h3900 h4000 h5000 hawkboard
+ hipox htcalpine htcapache htcblueangel htchimalaya htcsable htctornado
+ htcuniversal hx2000 hx4700 imote2 ixp4xxle kixrp435 kuropro logicpd-pxa270
+ looxc550 lspro magician mainstone mh355 mp900c mtx-3 mtx-3a mv2120 mx21ads
+ mx27ads n2100 navman-icn330 netbook-pro neuros-osd neuros-osd2 nhk15 nokia770
+ nslu2le omap1510inn omap1610h2 omap1710h3 omap5912osk openrd-base openrd-client
+ palmld palmt650 palmt680 palmtc palmtt palmtt3 palmtt5 palmtx palmz31
+ palmz71 palmz72 poodle qemuarm rokre2 rokr-e2 rokre6 ronetix-pm9261
+ ronetix-pm9263 sgh-i900 sheevaplug spitz stamp9g20evb topas910 tosa
+ triton ts409 tsx09 tx25 tx27" ;;
 	"armv5teb")
 			machines="fsg3be ixp4xxbe nslu2be" ;;
 	"armv6")
-			machines="bug iphone mx31ads mx31moboard mini6410 nokia800 omap2420h4 omap2430sdp smartq5 smartqv7 smdk6410" ;;
+			machines="bug iphone mx31ads mx31moboard mini6410 nokia800 omap2420h4 omap2430sdp pcm043 smartq5 smartqv7 smdk6410" ;;
 	"armv6-novfp")
 			machines="htcblackstone htcdiamond htcdream htckaiser htcnike htcpolaris htcraphael htctitan htcvogue" ;;
 	"armv7a")
-			machines="am3517-evm archos5 archos5it beagleboard bug20 cm-t35 dm37x-evm am37x-evm am389x-evm babbage c6a816x-evm efikamx htcleo igep0020 nokia900 omap3517-evm omap3evm omap3-pandora omap3-touchbook omap4430-sdp omapzoom omapzoom2 omapzoom36x overo palmpre omap4430-panda" ;;
+			machines="am3517-evm am3517-crane am45x-evm archos5 archos5it beagleboard bug20 cm-t35 dm37x-evm am37x-evm am387x-evm am389x-evm babbage c6a814x-evm c6a816x-evm dm814x-evm efikamx htcleo igep0020 nokia900 omap3517-evm omap3evm omap3-pandora omap3-touchbook omap4430-sdp omapzoom omapzoom2 omapzoom36x overo palmpre omap4430-panda usrp-embedded usrp-e1xx" ;;
+	"armv7a-vfp")
+			machines="ac100" ;;
 	"avr32")
 			machines="at32stk1000 atngw100" ;;
 	"bfin")
@@ -81,7 +100,7 @@ case "$arch" in
 	"mips")
 			machines="qemumips" ;;
 	"mipsel")
-			machines="ben-nanonote db1200 lsmipsel mtx-1 mtx-2 qemumipsel rb500 stb225 wgt634u wl500g wrt54 xxs1500" ;;
+			machines="ben-nanonote db1200 lsmipsel mtx-1 mtx-2 qemumipsel rb500 stb225 wgt634u wl500g wrt54" ;;
 	"powerpc")
 			machines="gamecube p2020ds" ;;
 	"ppc405")
@@ -108,7 +127,7 @@ case "$arch" in
 			machines="colinux" ;;
 esac
 
-if [ $(find . -name  "*.ipk"| grep $arch | wc -l) -gt 0 ] ; then
+if [ $(find . -name  "*_$arch.ipk"| wc -l) -gt 0 ] ; then
 	export SORTFEED=1
 else
 	export SORTFEED=0
@@ -118,7 +137,7 @@ echo "Sorting $arch"
 
 mkdir -p ../$archdir/base/ || true
 for i in `find . -name  "*_$arch.ipk"` ; do mv $i ../$archdir/base/ ; done
-        for machine in $machines ; do
+        for machine in $((echo $machines ; echo $machines | sed s:-:_:g) | sed -e s:\ :\\n: | sort | uniq) ;  do
                 for i in `find . -name  "*_$machine.ipk"| grep $machine` ; do mkdir -p ../$archdir/machine/$machine || true ;mv $i ../$archdir/machine/$machine ; done
 	done
 ( cd ../$archdir && do_index )
@@ -145,7 +164,7 @@ for i in ../* ; do
   if [ -d $i ]; then
       cd $i
       echo -n "building index for $i:" |sed s:\.\./::
-      ${ipkg_tools_path}/ipkg-make-index -m -p Packages -l Packages.filelist  -L ../locales  . >& /tmp/index-log
+      ${ipkg_tools_path}/opkg-make-index -m -p Packages -l Packages.filelist  -L ../locales  . >& /tmp/index-log
       echo " DONE"
   fi
 done
@@ -156,7 +175,7 @@ echo -n "building index for locales:"
 for i in ../* ; do
   if [ -d $i ]; then
    echo -n " $i" |sed s:\.\./::
-   ${ipkg_tools_path}/ipkg-make-index -m -p Packages -l Packages.filelist . >& /dev/null;
+   ${ipkg_tools_path}/opkg-make-index -m -p Packages -l Packages.filelist . >& /dev/null;
    cd $i
   fi
  done
@@ -170,7 +189,7 @@ for i in ./* ; do
   if [ -d $i ]; then
      cd $i
      echo -n "building index for machine $i:"
-     ${ipkg_tools_path}/ipkg-make-index -m -p Packages -l Packages.filelist . >& /dev/null
+     ${ipkg_tools_path}/opkg-make-index -m -p Packages -l Packages.filelist . >& /dev/null
      echo " DONE"
      cd ../
   fi
@@ -181,12 +200,12 @@ cd ${BPWD}
 
 echo "Processing 'all' feed"
 for i in `find . -name  "*.ipk"| grep _all` ; do mkdir -p ../all/ || true ;mv $i ../all/ ; done
- (mkdir -p ../all ; cd ../all && ${ipkg_tools_path}/ipkg-make-index -p Packages -m . >& /dev/null ; touch Packages.sig )
+ (mkdir -p ../all ; cd ../all && ${ipkg_tools_path}/opkg-make-index -p Packages -m . >& /dev/null ; touch Packages.sig )
 
 mkdir -p ../sdk ; mv *sdk.ipk ../sdk/ || true
- (mkdir -p ../sdk ; cd ../sdk && ${ipkg_tools_path}/ipkg-make-index -p Packages -m . >& /dev/null ; touch Packages.sig )
+ (mkdir -p ../sdk ; cd ../sdk && ${ipkg_tools_path}/opkg-make-index -p Packages -m . >& /dev/null ; touch Packages.sig )
 
-for arch in 486sx armv4t armv4 armv5teb armv5te armv6-novfp armv6 armv7a avr32 bfin geode i486 i586 i686 iwmmxt mips mipsel powerpc ppc405 ppc440e ppc603e ppce300c2 ppce300c3 ppce500v2 ppce500 ppce600 sh4 sparc x86_64 x86; do
+for arch in 486sx armv4t armv4 armv5teb armv5te armv6-novfp armv6 armv7a-vfp armv7a avr32 bfin geode i486 i586 i686 iwmmxt mips mipsel powerpc ppc405 ppc440e ppc603e ppce300c2 ppce300c3 ppce500v2 ppce500 ppce600 sh4 sparc x86_64 x86; do
 	do_sort
 done
 
diff --git a/contrib/angstrom/source-mirror.txt b/contrib/source-mirror.txt
similarity index 100%
rename from contrib/angstrom/source-mirror.txt
rename to contrib/source-mirror.txt
diff --git a/contrib/angstrom/upload-packages.sh b/contrib/upload-packages.sh
similarity index 100%
rename from contrib/angstrom/upload-packages.sh
rename to contrib/upload-packages.sh
diff --git a/contrib/angstrom/upload-pstage.sh b/contrib/upload-pstage.sh
similarity index 100%
rename from contrib/angstrom/upload-pstage.sh
rename to contrib/upload-pstage.sh