diff --git a/arch/avr/src/at91uc3/at91uc3_pinmux.h b/arch/avr/src/at91uc3/at91uc3_pinmux.h
new file mode 100755
index 0000000000000000000000000000000000000000..94fd7e89bd50cf9b59d8448feb967d8b0bb2ccbe
--- /dev/null
+++ b/arch/avr/src/at91uc3/at91uc3_pinmux.h
@@ -0,0 +1,71 @@
+/************************************************************************************
+ * arch/avr/src/at91uc3/at91uc3_pinmux.h
+ *
+ *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * 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.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "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
+ * COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ *
+ ************************************************************************************/
+
+#ifndef __ARCH_AVR_SRC_AT91UC3_AT91UC3_PINMUX_H
+#define __ARCH_AVR_SRC_AT91UC3_AT91UC3_PINMUX_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+#include "chip.h"
+
+#if defined(CONFIG_ARCH_CHIP_AT91UC3B)
+#  include "at91uc3b_pinmux.h"
+#elif defined(CONFIG_ARCH_CHIP_AT91UC3A)
+#  include "at91uc3a_pinmux.h"
+#else
+#  error "Unknown AVR32 chip"
+#endif
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Types
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Data
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+#endif /* __ARCH_AVR_SRC_AT91UC3_AT91UC3_PINMUX_H */
+
diff --git a/arch/avr/src/at91uc3/at91uc3a_pinmux.h b/arch/avr/src/at91uc3/at91uc3a_pinmux.h
new file mode 100755
index 0000000000000000000000000000000000000000..630fc47a92810560cfa74955150dbe0d25bccf05
--- /dev/null
+++ b/arch/avr/src/at91uc3/at91uc3a_pinmux.h
@@ -0,0 +1,64 @@
+/************************************************************************************
+ * arch/avr/src/at91uc3/at91uc3a_pinmux.h
+ *
+ *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * 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.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "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
+ * COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ *
+ ************************************************************************************/
+
+#ifndef __ARCH_AVR_SRC_AT91UC3_AT91UC3A_PINMUX_H
+#define __ARCH_AVR_SRC_AT91UC3_AT91UC3A_PINMUX_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+#warning "Not Implemented"
+
+/************************************************************************************
+ * Public Types
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Data
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+#endif /* __ARCH_AVR_SRC_AT91UC3_AT91UC3_PINMUX_H */
+
diff --git a/arch/avr/src/at91uc3/at91uc3b_pinmux.h b/arch/avr/src/at91uc3/at91uc3b_pinmux.h
index 88bae8e0a5da12c55ee083df287e4ba48d485415..2361fb9b271989f836e06ce45334cb7677c9eafb 100755
--- a/arch/avr/src/at91uc3/at91uc3b_pinmux.h
+++ b/arch/avr/src/at91uc3/at91uc3b_pinmux.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/avr/src/at91uc3/at91uc3_pinmux.h
+ * arch/avr/src/at91uc3/at91uc3b_pinmux.h
  *
  *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_AVR_SRC_AT91UC3_AT91UC3_PINMUX_H
-#define __ARCH_AVR_SRC_AT91UC3_AT91UC3_PINMUX_H
+#ifndef __ARCH_AVR_SRC_AT91UC3_AT91UC3B_PINMUX_H
+#define __ARCH_AVR_SRC_AT91UC3_AT91UC3B_PINMUX_H
 
 /************************************************************************************
  * Included Files
@@ -256,5 +256,5 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_AVR_SRC_AT91UC3_AT91UC3_PINMUX_H */
+#endif /* __ARCH_AVR_SRC_AT91UC3_AT91UC3B_PINMUX_H */