diff --git a/misc/zebra/bib1_biblios.att b/misc/zebra/bib1_biblios.att
index bc0c5000e3..35c2af4b4a 100644
--- a/misc/zebra/bib1_biblios.att
+++ b/misc/zebra/bib1_biblios.att
@@ -1,3 +1,4 @@
+# $Id: bib1_biblios.att,v 1.3 2007/05/30 09:33:22 tipaul Exp $
 # Bib-1 Attribute Set
 name bib1
 reference Bib-1
@@ -97,26 +98,82 @@ att 1028            Stock-number
 att 1030            Thematic-number
 att 1031            Material-type
 att 1032            Doc-id
-att 1033            Branch
+att 1033            Host-item
 att 1034            Content-type
 att 1035            Anywhere
 att 1036            Author-Title-Subject
 
-# Koha Specific Stuff
 
-att 8900			Call-Number
-att 8910			Koha-Auth-Number
-att 8800			date-entered-on-file
-att 8801			date1
-att 8802			date2
-att 8805			language
-att 8822			ff8-22
-att 8833			ff8-33
-att 8834			ff8-34
+# Koha Local-Use Biblio Indexes
+att 9001			Control-number
+att 9002			biblioitemnumber
+att 9003			totalissues
+att 9004			cn-bib-source
+att 9005			cn-bib-sort
+att 9006			itemtype
+att 9007			cn-class
+att 9008			cn-item
+att 9009			cn-prefix
+att 9010			cn-suffix
 
+# Items Index
+att 8001 withdrawn
+att 8002 lost
+att 8003 classification-source
+att 8004 materials-specified
+att 8005 damaged
+att 8006 restricted
+att 8007 cn-sort
+att 8008 notforloan
+att 8009 ccode
+att 8010 itemnumber
+att 8011 homebranch
+att 8012 holdingbranch
+att 8013 location
+att 8014 Date-of-acquisition
+att 8015 acqsource
+att 8016 coded-location-qualifier
+att 8017 price
+att 8018 stack
+att 8019 issues
+att 8020 renewals
+att 8021 reserves
+att 8022 Local-classification
+att 8023 barcode
+att 8024 onloan
+att 8025 datelastseen
+att 8026 datelastborrowed
+att 8027 copynumber
+att 8028 uri
+att 8029 replacementprice
+att 8030 replacementpricedate
+
+## Fixed Fields and other special indexes
+att 9901			Extent
+att 9910			Koha-Auth-Number
+# record length according to the leader
+att 9905			llength
+att 9902			Summary	
+att 9990			Call-Number
+# Usually Target Audience 008/22
+att 8822			ta
+# Usually Form of item 008/23
+att 8823			ff8-23
+# Usually Nature of contents 008/24-27
+att 8824			ff8-24-27
+# Usually Content-type, also Form of item for maps 008/29
+att 8829			ff8-29
+# Usually Literary Form 008/33
+att 8833			lf
+#att 8833			ff8-33
+# Usually Biography, also Special format characteristics for maps 008/34
+att 8834			bio
+#att 8834			ff8-34
 att 8700			ff7-00
 att 8701			ff7-01
 att 8702			ff7-02
-
-att 9522            onloan
-att 9523            popularity
+att 8703			ff7-01-02
+# Author-personal-bibliography - lastname,firstname in 100$a
+att 9900		Author-personal-bibliography
+# Author-in-order - firstname lastname in 245$c statement of responsibility
+att 9902		Author-in-order
diff --git a/misc/zebra/ccl.properties b/misc/zebra/ccl.properties
index af7b0efa69..5ad0650318 100644
--- a/misc/zebra/ccl.properties
+++ b/misc/zebra/ccl.properties
@@ -1,5 +1,4 @@
 # CCL field mappings
-# $Id: ccl.properties,v 1.6 2007/07/19 16:01:39 hdl Exp $
 # There are four types of lines in a CCL profile: 
 #  1. qualifier specification
 #	qualifier-name   [  attributeset   ,]  type   =   val   [  attributeset   ,]  type   =   val   ...
@@ -789,12 +788,11 @@ se Title-series
 #                                                           711
 Title-uniform           1=6
 ut Title-uniform
-
 #Authority-Number           Koha-Auth-Number  The Number   
 #                           for an authority to be searched subfield $9 in the
 #                           for cataloging purposes.        following: 700,701,702,710,
 #                                                           711,712 and some 6XX fields (Unimarc)
-Authority-Number           1=8910
+Authority-Number           1=9910
 an Authority-Number
 Koha-Auth-Number Authority-Number
 
@@ -869,14 +867,14 @@ st-numeric 	4=109
 ### 5. BIB1 TRUNCATION ATTRIBUTES
 right-Truncation 5=1
 rt right-Truncation
-left-Truncation         5=2
-left-and-right  5=3
-do-not-truncate         5=100
-process-in-search-term  5=101
-regExpr-1       5=102
+left-Truncation 	5=2
+left-and-right 	5=3
+do-not-truncate 	5=100
+process-in-search-term 	5=101
+regExpr-1 	5=102
 fuzzy 5=103
-regExpr-2       5=103
-Z39-58  5=104
+regExpr-2 	5=103
+Z39-58	5=104
 
 ### 6. BIB1 STRUCTURE ATTRIBUTES
 incomplete-subfield  	6=1
@@ -961,7 +959,7 @@ l-format 1=8703
 #fmt format
 
 # BRANCH (of local library)
-branch 1=1033
+homebranch 1=1033
 
 # Item Type
 
diff --git a/misc/zebra/record_biblios_unimarc.abs b/misc/zebra/record_biblios_unimarc.abs
index 2e477c5485..4bca871864 100644
--- a/misc/zebra/record_biblios_unimarc.abs
+++ b/misc/zebra/record_biblios_unimarc.abs
@@ -322,12 +322,12 @@ melm 676$a		Dewey-classification:w,Dewey-classification:s
 #############"# item information (based on 995) ###############
 melm 995$j		LC-card-number:s
 
-#melm 952$a		Local-classification
-#melm 995$a		Record-source
-melm 995$a		Branch,Host-item
-melm 995$c		Branch,Record-Source
-melm 995$d		Branch,Record-Source
-melm 995$f		Stock-number
+melm 995$a		homebranch,Host-item
+melm 995$b		homebranch,Host-item
+melm 995$c		holdingbranch,Record-Source
+melm 995$d		holdingbranch,Record-Source
+melm 995$e      location
+melm 995$f		barcode
 melm 995$k      Call-Number,Local-Classification,lcn,Call-Number:p,Local-Classification:p,lcn:p
 melm 995$s      popularity:n,popularity:s
 melm 995$n      onloan:d,onloan:n,onloan:s