diff --git a/Makefile.conf.in b/Makefile.conf.in
index ed8edb9..77bc5b9 100644
--- a/Makefile.conf.in
+++ b/Makefile.conf.in
@@ -23,7 +23,7 @@ INCLUDE=-I/usr/local/include -I$(TOPDIR)/include
 COPTS = $(c_opts)
 COPTS += -Wall -Wstrict-prototypes -fomit-frame-pointer -pipe
 LINKER=ld
-SNDLIB=-lsound
+SNDLIB=-lasound
 NCURSESINC="<ncurses.h>"
 NCURSESLIB=-lncurses
 LN_S=@LN_S@
diff --git a/alsamixer/alsamixer.c b/alsamixer/alsamixer.c
index 377ff71..daadbf8 100644
--- a/alsamixer/alsamixer.c
+++ b/alsamixer/alsamixer.c
@@ -20,7 +20,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include <linux/sound.h>
 
 #include <errno.h>
 
@@ -36,7 +35,7 @@
 #endif
 #include <time.h>
 
-#include <sys/soundlib.h>
+#include <sys/asoundlib.h>
 
 /* example compilation commandline:
  * clear; gcc -Wall -pipe -O2 alsamixer.c -o alsamixer -lncurses
diff --git a/amixer/amain.cpp b/amixer/amain.cpp
index e0d9255..e98b593 100644
--- a/amixer/amain.cpp
+++ b/amixer/amain.cpp
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/soundlib.h>
+#include <sys/asoundlib.h>
 #include "amixer.h"
 
 #define MIXER_RC ".amixerrc"
diff --git a/amixer/amixer.cpp b/amixer/amixer.cpp
index af7f925..189bd14 100644
--- a/amixer/amixer.cpp
+++ b/amixer/amixer.cpp
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/soundlib.h>
+#include <sys/asoundlib.h>
 #include "amixer.h"
 
 
diff --git a/aplay/aplay.c b/aplay/aplay.c
index 55835c4..11db613 100644
--- a/aplay/aplay.c
+++ b/aplay/aplay.c
@@ -34,7 +34,7 @@
 #include <getopt.h>
 #include <fcntl.h>
 #include <ctype.h>
-#include <sys/soundlib.h>
+#include <sys/asoundlib.h>
 #include "config.h"
 #include "formats.h"
 
diff --git a/configure.in b/configure.in
index eed6393..ff8182a 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ AC_PROG_LN_S
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CONFIG_HEADER(include/config.h)
-AC_CHECK_HEADERS(linux/sound.h sys/soundlib.h)
+AC_CHECK_HEADERS(linux/asound.h sys/asoundlib.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -28,12 +28,12 @@ if test "$myprefix" = "NONE"; then
   myprefix=$ac_default_prefix
 fi
 CFLAGS="-I$myprefix/include"
-LIBS="-L$myprefix/lib -lsound"
+LIBS="-L$myprefix/lib -lasound"
 #echo "CFLAGS=$CFLAGS"
 #echo "LIBS=$LIBS"
 AC_MSG_CHECKING(for alsa-lib package)
 AC_TRY_RUN([
-#include <sys/soundlib.h>
+#include <sys/asoundlib.h>
 void main(void)
 {
   snd_cards();