diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 88e61ec603..2736ccc1ce 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-31  Anthony Green  <green@moxielogic.com>
+
+	* config.bfd (targ_cpu): Add moxie-uclinux support.
+
 2009-07-31  Hans-Peter Nilsson  <hp@bitrange.com>
 
 	* linker.c (fix_syms): Consider SEC_LOAD when choosing section.
diff --git a/bfd/config.bfd b/bfd/config.bfd
index b95079fbfc..029fa34305 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -418,7 +418,7 @@ case "${targ}" in
     targ_selvecs=bfd_elf32_frv_vec
     ;;
 
-  moxie-*-elf)
+  moxie-*-elf | moxie-*-uclinux)
     targ_defvec=bfd_elf32_moxie_vec
     ;;
 
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4eff58b090..72580e630a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-31  Anthony Green  <green@moxielogic.com>
+
+	* configure.tgt (generic_target): Add moxie-uclinux support.
+
 2009-07-30  Nick Clifton  <nickc@redhat.com>
 
 	* doc/c-arm.texi (ARM-Instruction-Set): New node.  Documents the
diff --git a/gas/configure.tgt b/gas/configure.tgt
index da0cb1d0b3..1539706882 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -149,7 +149,8 @@ case ${generic_target} in
   frv-*-*linux*)			fmt=elf em=linux;;
   frv-*-*)				fmt=elf ;;
 
-  moxie-*-*)                             fmt=elf ;;
+  moxie-*-uclinux)                      fmt=elf em=linux;;
+  moxie-*-*)                            fmt=elf ;;
 
   hppa-*-linux*)
     case ${cpu} in