diff --git a/FreeImage_unbundle.patch b/FreeImage_unbundle.patch
index 69d8019e0ad304d758dc85fbd2f8f270488aca71..d2db8ed8b18a168d19280d9df1a02ddfd78b9e02 100644
--- a/FreeImage_unbundle.patch
+++ b/FreeImage_unbundle.patch
@@ -30,7 +30,14 @@ diff -rupN FreeImage/gensrclist.sh FreeImage-new/gensrclist.sh
 diff -rupN FreeImage/Makefile.fip FreeImage-new/Makefile.fip
 --- FreeImage/Makefile.fip	2015-03-10 08:03:56.000000000 +0100
 +++ FreeImage-new/Makefile.fip	2018-07-31 23:37:58.556953201 +0200
-@@ -17,20 +17,22 @@ MODULES = $(SRCS:.c=.o)
+@@ -11,26 +11,27 @@
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+ 
+-LIBRARIES = -lstdc++
++LIBRARIES = -lstdc++ -ljxrglue $(shell pkg-config --libs libjpeg libopenjp2 libpng libraw libtiff-4 libwebpmux OpenEXR zlib) -lm -LDist -lfreeimage-$(VER_MAJOR).$(VER_MINOR)
+ 
+ MODULES = $(SRCS:.c=.o)
  MODULES := $(MODULES:.cpp=.o)
  CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden
  # OpenJPEG
@@ -51,7 +58,6 @@ diff -rupN FreeImage/Makefile.fip FreeImage-new/Makefile.fip
 +override CXXFLAGS += -D__ANSI__
 +override CXXFLAGS += $(INCLUDE)
 +LDFLAGS ?=
-+override LDFLAGS += -LDist -lfreeimage-$(VER_MAJOR).$(VER_MINOR)
  
  ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
 -	CFLAGS += -fPIC
@@ -61,7 +67,7 @@ diff -rupN FreeImage/Makefile.fip FreeImage-new/Makefile.fip
  endif
  
  TARGET  = freeimageplus
-@@ -68,7 +70,7 @@ $(STATICLIB): $(MODULES)
+@@ -68,7 +69,7 @@
  	$(AR) r $@ $(MODULES)
  
  $(SHAREDLIB): $(MODULES)
@@ -70,10 +76,15 @@ diff -rupN FreeImage/Makefile.fip FreeImage-new/Makefile.fip
  
  install:
  	install -d $(INCDIR) $(INSTALLDIR)
-diff -rupN FreeImage/Makefile.gnu FreeImage-new/Makefile.gnu
 --- FreeImage/Makefile.gnu	2015-03-10 08:04:00.000000000 +0100
 +++ FreeImage-new/Makefile.gnu	2018-07-31 23:37:58.556953201 +0200
-@@ -16,21 +16,11 @@ LIBRARIES = -lstdc++
+@@ -11,26 +11,15 @@
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+ 
+-LIBRARIES = -lstdc++
++LIBRARIES = -lstdc++ -ljxrglue $(shell pkg-config --libs libjpeg libopenjp2 libpng libraw libtiff-4 libwebpmux OpenEXR zlib) -lm
+ 
  MODULES = $(SRCS:.c=.o)
  MODULES := $(MODULES:.cpp=.o)
  CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden
@@ -89,7 +100,6 @@ diff -rupN FreeImage/Makefile.gnu FreeImage-new/Makefile.gnu
 -CXXFLAGS += -D__ANSI__
 -CXXFLAGS += $(INCLUDE)
 +override CFLAGS += $(INCLUDE) -D__ANSI__ -I/usr/include/jxrlib $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib)
-+override LDFLAGS += -ljpeg -ljpegxr -ljxrglue $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib)
  
  ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
 -	CFLAGS += -fPIC
@@ -98,7 +108,7 @@ diff -rupN FreeImage/Makefile.gnu FreeImage-new/Makefile.gnu
  endif
  
  TARGET  = freeimage
-@@ -61,13 +51,13 @@ FreeImage: $(STATICLIB) $(SHAREDLIB)
+@@ -61,13 +50,13 @@
  	$(CC) $(CFLAGS) -c $< -o $@
  
  .cpp.o:
diff --git a/freeimage.spec b/freeimage.spec
index 827f9528acba70fc77717fdf7bbbbe7583f3f1b9..d3f8994afbf2c93e47e694cde6744e8d3421d755 100644
--- a/freeimage.spec
+++ b/freeimage.spec
@@ -1,12 +1,10 @@
-%undefine _ld_as_needed
-  
 %define major 3
 
 Name:    freeimage
 Version: 3.18.0
-Release: 13
+Release: 14
 Summary: FreeImage is a library project for developers who would like to support popular graphics image formats (PNG, JPEG, TIFF, BMP and others)
-License: GPLv2 or GPLv3 and FreeImage
+License: GPL-2.0-only OR GPL-3.0-only and FreeImage
 URL:	 https://freeimage.sourceforge.io/
 Source0: http://downloads.sourceforge.net/freeimage/FreeImage3180.zip
 
@@ -68,7 +66,6 @@ for file in `find . -type f -name '*.c' -or -name '*.cpp' -or -name '*.h' -or -n
   touch -r $file $file.new && mv $file.new $file
 done
 
-
 %build
 sh ./gensrclist.sh
 sh ./genfipsrclist.sh
@@ -94,16 +91,6 @@ ln -s lib%{name}plus-%{version}.so %{buildroot}%{_libdir}/lib%{name}plus.so
 install -Dpm 644 Source/FreeImage.h %{buildroot}%{_includedir}/FreeImage.h
 install -Dpm 644 Wrapper/FreeImagePlus/FreeImagePlus.h %{buildroot}%{_includedir}/FreeImagePlus.h
 
-# install missing symlink (was giving no-ldconfig-symlink rpmlint errors)
-ldconfig -n %{buildroot}%{_libdir}
-
-%pre
-%preun
-%post
-%postun
-
-%check
-
 %files
 %license license-*.txt 
 %doc README.linux README.md Whatsnew.txt
@@ -119,8 +106,11 @@ ldconfig -n %{buildroot}%{_libdir}
 %{_includedir}/FreeImagePlus.h
 %{_libdir}/lib%{name}plus.so
 
-
 %changelog
+* Sun Oct 27 2024 Funda Wang <fundawang@yeah.net> - 3.18.0-14
+- cleanup spec
+- finally fix linkage
+
 * Wed Oct 23 2024 wangkai <13474090681@163.com> - 3.18.0-13
 - Fix CVE-2020-24292 CVE-2020-24293 CVE-2020-24295 CVE-2021-33367
   CVE-2021-40263 CVE-2021-40266 CVE-2023-47995 CVE-2023-47997