diff --git a/lang/squeak-dev/Makefile b/lang/squeak-dev/Makefile
index ababa626a707..ce82a53256db 100644
--- a/lang/squeak-dev/Makefile
+++ b/lang/squeak-dev/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		squeak
 PORTVERSION=		3.6
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		lang
 ##################################################
 MASTER_SITES=		ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.6/ \
@@ -33,6 +33,7 @@ COMMENT=		Full Smalltalk 80 with portability to UNIX, Mac, and Windows
 
 # Don't set USE_ZIP as this breaks EXTRACT_CMD.
 BUILD_DEPENDS=		unzip:${PORTSDIR}/archivers/unzip
+LIB_DEPENDS=		audio.2:${PORTSDIR}/audio/nas
 
 ##################################################
 VMVERSION=		3.6-3
diff --git a/lang/squeak-dev/pkg-plist b/lang/squeak-dev/pkg-plist
index 4934bf409a5b..50f983df8eed 100644
--- a/lang/squeak-dev/pkg-plist
+++ b/lang/squeak-dev/pkg-plist
@@ -9,7 +9,7 @@ bin/squeak
 %%PLIST_X%%%%DATADIR%%/%%VMVERSION%%/B3DAcceleratorPlugin
 %%DATADIR%%/%%VMVERSION%%/UnixOSProcessPlugin
 %%PLIST_X%%%%DATADIR%%/%%VMVERSION%%/XDisplayControlPlugin
-%%PLIST_XIM%%share/squeak/%%VMVERSION%%/ImmX11Plugin
+%%PLIST_XIM%%%%DATADIR%%/%%VMVERSION%%/ImmX11Plugin
 %%PLIST_FFI%%%%DATADIR%%/%%VMVERSION%%/SqueakFFIPrims
 %%PLIST_NPSQUEAK%%%%DATADIR%%/npsqueak.image
 %%PLIST_NPSQUEAK%%%%DATADIR%%/%%VMVERSION%%/npsqueak.so
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index ababa626a707..ce82a53256db 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		squeak
 PORTVERSION=		3.6
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		lang
 ##################################################
 MASTER_SITES=		ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.6/ \
@@ -33,6 +33,7 @@ COMMENT=		Full Smalltalk 80 with portability to UNIX, Mac, and Windows
 
 # Don't set USE_ZIP as this breaks EXTRACT_CMD.
 BUILD_DEPENDS=		unzip:${PORTSDIR}/archivers/unzip
+LIB_DEPENDS=		audio.2:${PORTSDIR}/audio/nas
 
 ##################################################
 VMVERSION=		3.6-3
diff --git a/lang/squeak/pkg-plist b/lang/squeak/pkg-plist
index 4934bf409a5b..50f983df8eed 100644
--- a/lang/squeak/pkg-plist
+++ b/lang/squeak/pkg-plist
@@ -9,7 +9,7 @@ bin/squeak
 %%PLIST_X%%%%DATADIR%%/%%VMVERSION%%/B3DAcceleratorPlugin
 %%DATADIR%%/%%VMVERSION%%/UnixOSProcessPlugin
 %%PLIST_X%%%%DATADIR%%/%%VMVERSION%%/XDisplayControlPlugin
-%%PLIST_XIM%%share/squeak/%%VMVERSION%%/ImmX11Plugin
+%%PLIST_XIM%%%%DATADIR%%/%%VMVERSION%%/ImmX11Plugin
 %%PLIST_FFI%%%%DATADIR%%/%%VMVERSION%%/SqueakFFIPrims
 %%PLIST_NPSQUEAK%%%%DATADIR%%/npsqueak.image
 %%PLIST_NPSQUEAK%%%%DATADIR%%/%%VMVERSION%%/npsqueak.so