diff --git a/components/interbase/interbaselaz.pas b/components/interbase/interbaselaz.pas
index 8c4690516d..1480baf99f 100644
--- a/components/interbase/interbaselaz.pas
+++ b/components/interbase/interbaselaz.pas
@@ -8,7 +8,7 @@ unit InterbaseLaz;
 interface
 
 uses
-  RegisterInterbase, LazarusPackageIntf; 
+  RegisterInterbase, Interbase, LazarusPackageIntf; 
 
 implementation
 
diff --git a/components/interbase/registerinterbase.pas b/components/interbase/registerinterbase.pas
index ca58e5ace5..adf05ad8df 100644
--- a/components/interbase/registerinterbase.pas
+++ b/components/interbase/registerinterbase.pas
@@ -30,7 +30,8 @@ implementation
 
 procedure RegisterUnitInterbase;
 begin
-  RegisterComponents('Interbase',[TIBDatabase,TIBTransaction{,TIBQuery}]);
+  RegisterComponents('Interbase',[TIBDatabase,TIBTransaction
+                                  {$IFNDEF VER1_0},TIBQuery{$ENDIF}]);
 end;
 
 procedure Register;
diff --git a/tools/install/build_fpc_rpm.sh b/tools/install/build_fpc_rpm.sh
index b23aa059e2..4efcc382d1 100644
--- a/tools/install/build_fpc_rpm.sh
+++ b/tools/install/build_fpc_rpm.sh
@@ -158,6 +158,14 @@ else
   fi
   cd -
   
+  # fix Makefile bug: it tests /usr/src/redhat, instaed of /usr/src/redhat/RPMS
+  cd $TmpDir
+  cat Makefile | \
+    sed -e 's#ifeq ($(wildcard $(REDHATDIR)),)#ifeq ($(wildcard $(REDHATDIR)/RPMS),)#' \
+    > New.Makefile
+  mv New.Makefile Makefile
+  cd -
+
   # fix fpc.spec bug: smart_strip.sh is searched at wrong location
   SmartStripWhileBuild="/usr/src/redhat/BUILD/fpc-$CompilerVersion.$CompilerRelease.$CompilerPatch/smart_strip.sh"
   cat $SpecFile | \