diff --git a/file-5.04-biorad.dif b/file-5.04-biorad.dif
new file mode 100644
index 0000000..56c4608
--- /dev/null
+++ b/file-5.04-biorad.dif
@@ -0,0 +1,26 @@
+--- magic/Magdir/images
++++ magic/Magdir/images	2010-11-24 12:11:01.520426341 +0000
+@@ -551,11 +551,18 @@
+ # Bio-Rad .PIC is an image format used by microscope control systems
+ # and related image processing software used by biologists.
+ # From: Vebjorn Ljosa <vebjorn@ljosa.com>
+-54	leshort 12345		Bio-Rad .PIC Image File
+->0	leshort >0		%hd x
+->2	leshort >0		%hd,
+->4	leshort =1		1 image in file
+->4	leshort >1		%hd images in file
++# BOOL values are two-byte integers; use them to rule out false positives.
++# http://web.archive.org/web/20050317223257/www.cs.ubc.ca/spider/ladic/text/biorad.txt
++# Samples: http://www.loci.wisc.edu/software/sample-data
++14	leshort	<2
++>4	leshort >0
++>49	byte 0
++>62	leshort <2
++>>54	leshort 12345		Bio-Rad .PIC Image File
++>>>0	leshort >0		%hd x
++>>>2	leshort >0		%hd,
++>>>4	leshort =1		1 image in file
++>>>4	leshort >1		%hd images in file
+ 
+ # From Jan "Yenya" Kasprzak <kas@fi.muni.cz>
+ # The description of *.mrw format can be found at
diff --git a/file-5.04-visibility.patch b/file-5.04-visibility.patch
new file mode 100644
index 0000000..d105a6c
--- /dev/null
+++ b/file-5.04-visibility.patch
@@ -0,0 +1,31 @@
+--- src/Makefile.am.orig
++++ src/Makefile.am
+@@ -11,7 +11,7 @@ libmagic_la_SOURCES = magic.c apprentice
+ 	encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \
+ 	funcs.c file.h names.h patchlevel.h readelf.h tar.h apptype.c \
+ 	file_opts.h elfclass.h mygetopt.h cdf.c cdf_time.c readcdf.c cdf.h
+-libmagic_la_LDFLAGS = -no-undefined -version-info 1:0:0
++libmagic_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libmagic.map -no-undefined -version-info 1:0:0
+ libmagic_la_LIBADD = $(LTLIBOBJS)
+ 
+ file_SOURCES = file.c
+--- /dev/null
++++ src/libmagic.map
+@@ -0,0 +1,16 @@
++{
++global:
++  magic_buffer;
++  magic_check;
++  magic_close;
++  magic_compile;
++  magic_descriptor;
++  magic_errno;
++  magic_error;
++  magic_file;
++  magic_getpath;
++  magic_load;
++  magic_open;
++  magic_setflags;
++local: *;
++};
+\ No newline at end of file
diff --git a/file.changes b/file.changes
index e5a8c46..d21eb31 100644
--- a/file.changes
+++ b/file.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Nov 24 13:17:11 CET 2010 - werner@suse.de
+
+- Add patch for Bio-Rad image format to avoid conflicts with other
+  magic records like RPM and even some ACII files (bnc#654696)
+
+-------------------------------------------------------------------
+Fri Nov  5 22:41:23 UTC 2010 - cristian.rodriguez@opensuse.org
+
+- libmagic: export only public interface symbols listed
+  in magic.h, this also avoids exporting interesting stuff
+  like strlcat, strlcpy... 
+
 -------------------------------------------------------------------
 Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de
 
diff --git a/file.spec b/file.spec
index af97940..6e22b47 100644
--- a/file.spec
+++ b/file.spec
@@ -59,6 +59,8 @@ Patch26:        file-4.24-solv.dif
 Patch27:        file-5.04-zip2.0.dif
 Patch28:        file-5.03-iso9660.dif
 Patch29:        file-5.04-llvm.dif
+Patch30:        file-5.04-visibility.patch
+Patch31:        file-5.04-biorad.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _sysconfdir /etc
 %global         _miscdir    %{_datadir}/misc
@@ -124,8 +126,9 @@ Authors:
 %patch27 -p0 -b .zip2.0
 %patch28 -p0 -b .iso9600
 %patch29 -p0 -b .llvm
+%patch30 -p0 -b .vis
+%patch31 -p0 -b .biorad
 %patch
-
 %build
 export LANG=POSIX
 export LC_ALL=POSIX