Lightmap filtering

I''m creating a Quake 2 rendering engine, and I was just working on the lightmaps. As you may know, the lightmaps are limited to 16x16, so I placed 64 of them in one texture (128x128). This works fine, except when I do a GL_LINEAR filter on the texture. There are black lines that border all the lightmaps (because it filters using the pixels outside of the lightmap border). Is there a better way of accomplishing this? I''d like to keep the lightmaps in this size texture unit, but I would like to get rid of the black borders. GL_NEAREST filter makes it look too blocky to use. Thanks, Mark Before I couldn''t spell engineer, now I are one!