diff --git a/ChangeLog b/ChangeLog
index 0b5fc8091e..a93f7c76e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-09	Kolja Waschk <waschk@telos.de>
+
+	* config-ml.in: New port to Altera NIOS II.
+
 2006-07-09      Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
 
 	* aclocal/bsp-alias.m4: (PR1117) Add brs5l as alias for gen5200
diff --git a/config-ml.in b/config-ml.in
index 807cc0b2cb..48b2fd0a67 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -226,6 +226,21 @@ h8300-*-rtems*)
 	  done
 	;;
 
+nios2-*-rtems*)
+	  old_multidirs=${multidirs}
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "${x}" in
+	      *pg* ) : ;;
+	      *EB* ) : ;;
+	      *hw-mulx* ) : ;;
+	      *fpu* ) : ;;
+	      *stack-check* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
+	;;
+
 sh-*-rtems*)
 	  old_multidirs=${multidirs}
 	  multidirs=""