diff --git a/library/dialect/swi.yap b/library/dialect/swi.yap
index 2edeb4692..38952e273 100755
--- a/library/dialect/swi.yap
+++ b/library/dialect/swi.yap
@@ -268,38 +268,6 @@ slp(T) :- sleep(T).
 prolog:sleep(T) :-
 	slp(T).
 
-% SWI has a dynamic attribute scheme
-
-prolog:get_attr(Var, Mod, Att) :-
-	functor(AttTerm, Mod, 2),
-	arg(2, AttTerm, Att),
-	attributes:get_module_atts(Var, AttTerm).
-
-prolog:put_attr(Var, Mod, Att) :-
-	functor(AttTerm, Mod, 2),
-	arg(2, AttTerm, Att),
-	attributes:put_module_atts(Var, AttTerm).
-
-prolog:del_attr(Var, Mod) :-
-	functor(AttTerm, Mod, 2),
-	attributes:del_all_module_atts(Var, AttTerm).
-
-prolog:del_attrs(Var) :-
-	attributes:del_all_atts(Var).
-
-prolog:get_attrs(AttVar, SWIAtts) :-
-	get_all_swi_atts(AttVar,SWIAtts).
-
-prolog:put_attrs(_, []).
-prolog:put_attrs(V, Atts) :-
-	cvt_to_swi_atts(Atts, YapAtts),
-	attributes:put_att_term(V, YapAtts).
-
-cvt_to_swi_atts([], _).
-cvt_to_swi_atts(att(Mod,Attribute,Atts), ModAttribute) :-
-	ModAttribute =.. [Mod, YapAtts, Attribute],
-	cvt_to_swi_atts(Atts, YapAtts).
-
 bindings_message(V) -->
        { cvt_bindings(V, Bindings) },
        prolog:message(query(_YesNo,Bindings)), !.
diff --git a/pl/attributes.yap b/pl/attributes.yap
new file mode 100644
index 000000000..1cefa0c45
--- /dev/null
+++ b/pl/attributes.yap
@@ -0,0 +1,56 @@
+/*************************************************************************
+*									 *
+*	 YAP Prolog 							 *
+*									 *
+*	Yap Prolog was developed at NCCUP - Universidade do Porto	 *
+*									 *
+* Copyright L.Damas, V.S.Costa and Universidade do Porto 1985-1997	 *
+*									 *
+**************************************************************************
+*									 *
+* File:		atts.yap						 *
+* Last rev:	8/2/88							 *
+* mods:									 *
+* comments:	attribute support for Prolog				 *
+*									 *
+*************************************************************************/
+
+:- module('$attributes', [get_attr/3,
+			   put_attr/3,
+			   del_attr/2,
+			   del_attrs/1,
+			   get_attrs/2,
+			   put_attrs/2
+			  ]).
+
+
+get_attr(Var, Mod, Att) :-
+	functor(AttTerm, Mod, 2),
+	arg(2, AttTerm, Att),
+	attributes:get_module_atts(Var, AttTerm).
+
+put_attr(Var, Mod, Att) :-
+	functor(AttTerm, Mod, 2),
+	arg(2, AttTerm, Att),
+	attributes:put_module_atts(Var, AttTerm).
+
+del_attr(Var, Mod) :-
+	functor(AttTerm, Mod, 2),
+	attributes:del_all_module_atts(Var, AttTerm).
+
+del_attrs(Var) :-
+	attributes:del_all_atts(Var).
+
+get_attrs(AttVar, SWIAtts) :-
+	attributes:get_all_swi_atts(AttVar,SWIAtts).
+
+put_attrs(_, []).
+put_attrs(V, Atts) :-
+	cvt_to_swi_atts(Atts, YapAtts),
+	attributes:put_att_term(V, YapAtts).
+
+cvt_to_swi_atts([], _).
+cvt_to_swi_atts(att(Mod,Attribute,Atts), ModAttribute) :-
+	ModAttribute =.. [Mod, YapAtts, Attribute],
+	cvt_to_swi_atts(Atts, YapAtts).
+
diff --git a/pl/init.yap b/pl/init.yap
index 47f5207ae..c473c61f3 100644
--- a/pl/init.yap
+++ b/pl/init.yap
@@ -83,6 +83,7 @@ lists:append([H|T], L, [H|R]) :-
 	 'eam.yap',
 	 'chtypes.yap',
 	 'yapor.yap',
+         'attributes.yap',
          'udi.yap'].
 
 :- dynamic prolog:'$user_defined_flag'/4.