diff --git a/ChangeLog b/ChangeLog
index 7626368a22..d137702a69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-14  David Schleef  <ds@schleef.org>
+
+	* gst/gstcpu.c: (gst_cpuid_i386): Fix problem when using
+	-fomit-frame-pointer.  Appears to generate correct code in
+	other cases as well.
+
 2004-06-14  Johan Dahlin  <johan@gnome.org>
 
 	* tools/gst-inspect.c (main): Add two new command line options: -a
diff --git a/gst/gstcpu.c b/gst/gstcpu.c
index 8824309467..c8e00750d9 100644
--- a/gst/gstcpu.c
+++ b/gst/gstcpu.c
@@ -72,11 +72,11 @@ gst_cpuid_i386 (int x, unsigned long *eax, unsigned long *ebx,
   asm (
       /* GCC-3.2 (and possibly others) don't clobber ebx properly,
        * so we save/restore it directly. */
-"  pushl %%ebx\n" "  cpuid\n" "  movl %%eax, %0\n" "  movl %%ebx, %1\n" "  movl %%ecx, %2\n" "  movl %%edx, %3\n" "  popl %%ebx\n":"=o" (regs[0]),
-      "=o" (regs[1]),
-      "=o" (regs[2]), "=o" (regs[3])
+"  movl %%ebx, %%esi\n" "  cpuid\n" "  movl %%eax, %0\n" "  movl %%ebx, %1\n" "  movl %%ecx, %2\n" "  movl %%edx, %3\n" "  movl %%esi, %%ebx\n":"=o" (regs[0]), "=o" (regs[1]), "=o" (regs[2]),
+      "=o" (regs
+          [3])
 :    "a" (x)
-:    "ecx", "edx");
+:    "ecx", "edx", "esi");
 
   *eax = regs[0];
   *ebx = regs[1];