diff --git a/src/conf/cards/Azalia.conf b/src/conf/cards/Azalia.conf
deleted file mode 100644
index 860c5b48..00000000
--- a/src/conf/cards/Azalia.conf
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# Configuration for the Intel AZX chips
-#
-
-<confdir:pcm/front.conf>
-
-Azalia.pcm.front.0 {
-	@args [ CARD ]
-	@args.CARD {
-		type string
-	}
-	type softvol
-	slave.pcm {
-		type hw
-		card $CARD
-		device 0
-	}
-	control {
-		name "PCM Playback Volume"
-		card $CARD
-	}
-}	
-
-# default with dmix+softvol & dsnoop
-HDA-Intel.pcm.default {
-	@args [ CARD ]
-	@args.CARD {
-		type string
-	}
-	type asym
-	playback.pcm {
-		type plug
-		slave.pcm {
-			type softvol
-			slave.pcm {
-				@func concat
-				strings [ "dmix:" $CARD ]
-			}
-			control {
-				name "PCM Playback Volume"
-				card $CARD
-			}
-		}
-	}
-	capture.pcm {
-		type plug
-		slave.pcm {
-			@func concat
-			strings [ "dsnoop:" $CARD ]
-		}
-	}
-}
-
-<confdir:pcm/surround40.conf>
-<confdir:pcm/surround41.conf>
-<confdir:pcm/surround50.conf>
-<confdir:pcm/surround51.conf>
-<confdir:pcm/surround71.conf>
-
-Azalia.pcm.surround40.0 cards.Azalia.pcm.front.0
-Azalia.pcm.surround51.0 cards.Azalia.pcm.front.0
-Azalia.pcm.surround71.0 cards.Azalia.pcm.front.0
-
-<confdir:pcm/iec958.conf>
-
-Azalia.pcm.iec958.0 {
-	@args [ CARD AES0 AES1 AES2 AES3 ]
-	@args.CARD {
-		type string
-	}
-	@args.AES0 {
-		type integer
-	}
-	@args.AES1 {
-		type integer
-	}
-	@args.AES2 {
-		type integer
-	}
-	@args.AES3 {
-		type integer
-	}
-	type hooks
-	slave.pcm {
-		type hw
-		card $CARD
-		device 0
-	}
-	hooks.0 {
-		type ctl_elems
-		hook_args [
-			{
-				name "IEC958 Playback Default"
-				lock true
-				preserve true
-				value [ $AES0 $AES1 $AES2 $AES3 ]
-			}
-			{
-				name "IEC958 Playback Switch"
-				lock true
-				preserve true
-				value true
-			}
-		]
-	}
-}
diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
index 87ed2e91..2e16a299 100644
--- a/src/conf/cards/Makefile.am
+++ b/src/conf/cards/Makefile.am
@@ -10,7 +10,6 @@ cfg_files = aliases.conf \
 	Audigy2.conf \
 	Aureon51.conf \
 	Aureon71.conf \
-	Azalia.conf \
 	CA0106.conf \
 	CMI8338.conf \
 	CMI8338-SWIEC.conf \
diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
index 42c7add0..915fd520 100644
--- a/src/conf/cards/aliases.conf
+++ b/src/conf/cards/aliases.conf
@@ -43,6 +43,7 @@ ESM1 cards.ES1968
 ES1978 cards.ES1968
 Allegro cards.Maestro3
 Canyon3D-2 cards.Maestro3
+Azalia cards.HDA-Intel
 
 <confdir:pcm/default.conf>
 <confdir:pcm/dmix.conf>