Index: packages/fcl-db/src/base/dataset.inc
===================================================================
--- packages/fcl-db/src/base/dataset.inc	(revision 27215)
+++ packages/fcl-db/src/base/dataset.inc	(working copy)
@@ -83,6 +83,7 @@
 procedure TDataSet.BindFields(Binding: Boolean);
 
 var i, FieldIndex: Integer;
+  TheLookupDataSet: TDataset;
 
 begin
   { FieldNo is set to -1 for calculated/lookup fields, to 0 for unbound field
@@ -98,13 +99,14 @@
           FOffset := FCalcFieldsSize;
           Inc(FCalcFieldsSize, DataSize + 1);
           if FieldKind in [fkLookup] then begin
-            if ((FLookupDataSet = nil) or (FLookupKeyFields = '') or
+            if ((FLookupDataSource = nil) or (FLookupKeyFields = '') or
                (FLookupResultField = '') or (FKeyFields = '')) then
               DatabaseErrorFmt(SLookupInfoError, [DisplayName]);
+            TheLookupDataSet := FLookupDataSource.DataSet;
             FFields.CheckFieldNames(FKeyFields);
-            FLookupDataSet.Open;
-            FLookupDataSet.Fields.CheckFieldNames(FLookupKeyFields);
-            FLookupDataSet.FieldByName(FLookupResultField);
+            TheLookupDataSet.Open;
+            TheLookupDataSet.Fields.CheckFieldNames(FLookupKeyFields);
+            TheLookupDataSet.FieldByName(FLookupResultField);
             if FLookupCache then RefreshLookupList;
           end
         end else begin
Index: packages/fcl-db/src/base/fields.inc
===================================================================
--- packages/fcl-db/src/base/fields.inc	(revision 27215)
+++ packages/fcl-db/src/base/fields.inc	(working copy)
@@ -627,8 +627,8 @@
 begin
   if FLookupCache then
     Value := LookupList.ValueOfKey(FDataSet.FieldValues[FKeyFields])
-  else if Assigned(FLookupDataSet) and FDataSet.Active then
-    Value := FLookupDataSet.Lookup(FLookupKeyfields, FDataSet.FieldValues[FKeyFields], FLookupresultField);
+  else if Assigned(FLookupDataSource) and FDataSet.Active then
+    Value := FLookupDataSource.DataSet.Lookup(FLookupKeyfields, FDataSet.FieldValues[FKeyFields], FLookupresultField);
 end;
 
 function TField.GetIndex: longint;
@@ -645,6 +645,28 @@
   Result := FieldKind = fkLookup;
 end;
 
+function TField.GetLookupDataSet: TDataSet;
+begin
+  if FLookupDataSource <> nil then
+    Result := FLookupDataSource.DataSet
+  else
+    Result := nil;
+end;
+
+procedure TField.LookupDataChange(Sender: TObject; Field: TField);
+begin
+  if (Field <> nil) and (Field = LookupDataSet.FindField(LookupResultField))
+    and (DataSet <> nil) and DataSet.Active then
+      DataSet.CalculateFields(DataSet.ActiveBuffer);
+end;
+
+procedure TField.LookupStateChange(Sender: TObject);
+begin
+  //when the linked lookup dataset is destroyied a state change event is fired
+  if FLookupDataSource.DataSet = nil then
+    FreeAndNil(FLookupDataSource);
+end;
+
 function TField.GetAsLargeInt: LargeInt;
 begin
   Raise AccessError(SLargeInt);
@@ -708,43 +730,36 @@
 procedure TField.RefreshLookupList;
 var
   tmpActive: Boolean;
+  TheLookupDataset: TDataSet;
 begin
-  if not Assigned(FLookupDataSet) or (Length(FLookupKeyfields) = 0)
+  if not Assigned(FLookupDataSource) or (Length(FLookupKeyfields) = 0)
   or (Length(FLookupresultField) = 0) or (Length(FKeyFields) = 0) then
     Exit;
-    
-  tmpActive := FLookupDataSet.Active;
+  TheLookupDataset := FLookupDataSource.DataSet;
+  tmpActive := TheLookupDataSet.Active;
   try
-    FLookupDataSet.Active := True;
+    TheLookupDataSet.Active := True;
     FFields.CheckFieldNames(FKeyFields);
-    FLookupDataSet.Fields.CheckFieldNames(FLookupKeyFields);
-    FLookupDataset.FieldByName(FLookupResultField); // I presume that if it doesn't exist it throws exception, and that a field with null value is still valid
+    TheLookupDataSet.Fields.CheckFieldNames(FLookupKeyFields);
+    TheLookupDataset.FieldByName(FLookupResultField); // I presume that if it doesn't exist it throws exception, and that a field with null value is still valid
     LookupList.Clear; // have to be F-less because we might be creating it here with getter!
 
-    FLookupDataSet.DisableControls;
+    TheLookupDataSet.DisableControls;
     try
-      FLookupDataSet.First;
-      while not FLookupDataSet.Eof do
+      TheLookupDataSet.First;
+      while not TheLookupDataSet.Eof do
       begin
-        FLookupList.Add(FLookupDataSet.FieldValues[FLookupKeyfields], FLookupDataSet.FieldValues[FLookupResultField]);
-        FLookupDataSet.Next;
+        FLookupList.Add(TheLookupDataSet.FieldValues[FLookupKeyfields], TheLookupDataSet.FieldValues[FLookupResultField]);
+        TheLookupDataSet.Next;
       end;
     finally
-      FLookupDataSet.EnableControls;
+      TheLookupDataSet.EnableControls;
     end;
   finally
-    FLookupDataSet.Active := tmpActive;
+    TheLookupDataSet.Active := tmpActive;
   end;
 end;
 
-procedure TField.Notification(AComponent: TComponent; Operation: TOperation);
-
-begin
-  Inherited Notification(AComponent,Operation);
-  if (Operation = opRemove) and (AComponent = FLookupDataSet) then
-    FLookupDataSet := nil;
-end;
-
 procedure TField.PropertyChanged(LayoutAffected: Boolean);
 
 begin
@@ -995,6 +1010,22 @@
   FieldKind := ValueToLookupMap[AValue];
 end;
 
+procedure TField.SetLookupDataSet(Value: TDataSet);
+begin
+  if Value <> nil then
+  begin
+    if FLookupDataSource = nil then
+    begin
+      FLookupDataSource := TDataSource.Create(Self);
+      FLookupDataSource.OnDataChange := @LookupDataChange;
+      FLookupDataSource.OnStateChange := @LookupStateChange;
+    end;
+    FLookupDataSource.DataSet := Value;
+  end
+  else
+    FreeAndNil(FLookupDataSource);
+end;
+
 procedure TField.SetReadOnly(const AValue: Boolean);
 begin
   if (FReadOnly<>AValue) then
Index: packages/fcl-db/src/base/db.pas
===================================================================
--- packages/fcl-db/src/base/db.pas	(revision 27215)
+++ packages/fcl-db/src/base/db.pas	(working copy)
@@ -287,7 +287,7 @@
     FIsIndexField : Boolean;
     FKeyFields : String;
     FLookupCache : Boolean;
-    FLookupDataSet : TDataSet;
+    FLookupDataSource : TDataSource;
     FLookupKeyfields : String;
     FLookupresultField : String;
     FLookupList: TLookupList;
@@ -307,6 +307,9 @@
     FProviderFlags : TProviderFlags;
     function GetIndex : longint;
     function GetLookup: Boolean;
+    function GetLookupDataSet: TDataSet;
+    procedure LookupDataChange(Sender: TObject; Field: TField);
+    procedure LookupStateChange(Sender: TObject);
     procedure SetAlignment(const AValue: TAlignMent);
     procedure SetIndex(const AValue: Longint);
     function GetDisplayText: String;
@@ -316,6 +319,7 @@
     procedure SetDisplayWidth(const AValue: Longint);
     function GetDisplayWidth: integer;
     procedure SetLookup(const AValue: Boolean);
+    procedure SetLookupDataSet(Value: TDataSet);
     procedure SetReadOnly(const AValue: Boolean);
     procedure SetVisible(const AValue: Boolean);
     function IsDisplayStored : Boolean;
@@ -352,7 +356,6 @@
     function GetParentComponent: TComponent; override;
     procedure GetText(var AText: string; ADisplayText: Boolean); virtual;
     function HasParent: Boolean; override;
-    procedure Notification(AComponent: TComponent; Operation: TOperation); override;
     procedure PropertyChanged(LayoutAffected: Boolean);
     procedure ReadState(Reader: TReader); override;
     procedure SetAsBCD(const AValue: TBCD); virtual;
@@ -440,7 +443,7 @@
     property ImportedConstraint: string read FImportedConstraint write FImportedConstraint;
     property KeyFields: string read FKeyFields write FKeyFields;
     property LookupCache: Boolean read FLookupCache write FLookupCache;
-    property LookupDataSet: TDataSet read FLookupDataSet write FLookupDataSet;
+    property LookupDataSet: TDataSet read GetLookupDataSet write SetLookupDataSet;
     property LookupKeyFields: string read FLookupKeyFields write FLookupKeyFields;
     property LookupResultField: string read FLookupResultField write FLookupResultField;
     property Origin: string read FOrigin write FOrigin;