diff --git a/src/libFLAC/i386/nasm.h b/src/libFLAC/i386/nasm.h
index 30b6b3f6..d5fc76a8 100644
--- a/src/libFLAC/i386/nasm.h
+++ b/src/libFLAC/i386/nasm.h
@@ -20,7 +20,7 @@
 
 %ifdef WIN32
 	%define FLAC__PUBLIC_NEEDS_UNDERSCORE
-	%idefine code_section section .text align=32 class=CODE use32
+	%idefine code_section section .text align=16 class=CODE use32
 	%idefine data_section section .data align=32 class=DATA use32
 	%idefine bss_section  section .bss  align=32 class=DATA use32
 %elifdef AOUT
@@ -29,9 +29,9 @@
 	%idefine data_section section .data
 	%idefine bss_section  section .bss
 %elifdef ELF
-	%idefine code_section section .text class=CODE use32
-	%idefine data_section section .data class=DATA use32
-	%idefine bss_section  section .bss  class=DATA use32
+	%idefine code_section section .text align=16
+	%idefine data_section section .data align=32
+	%idefine bss_section  section .bss  align=32
 %else
 	%error unsupported object format!
 %endif