diff --git a/src/gallium/state_trackers/glx/dri1/dri_context.c b/src/gallium/state_trackers/glx/dri/dri_context.c
similarity index 100%
rename from src/gallium/state_trackers/glx/dri1/dri_context.c
rename to src/gallium/state_trackers/glx/dri/dri_context.c
diff --git a/src/gallium/state_trackers/glx/dri1/dri_context.h b/src/gallium/state_trackers/glx/dri/dri_context.h
similarity index 100%
rename from src/gallium/state_trackers/glx/dri1/dri_context.h
rename to src/gallium/state_trackers/glx/dri/dri_context.h
diff --git a/src/gallium/state_trackers/glx/dri1/dri_drawable.c b/src/gallium/state_trackers/glx/dri/dri_drawable.c
similarity index 100%
rename from src/gallium/state_trackers/glx/dri1/dri_drawable.c
rename to src/gallium/state_trackers/glx/dri/dri_drawable.c
diff --git a/src/gallium/state_trackers/glx/dri1/dri_extensions.c b/src/gallium/state_trackers/glx/dri/dri_extensions.c
similarity index 100%
rename from src/gallium/state_trackers/glx/dri1/dri_extensions.c
rename to src/gallium/state_trackers/glx/dri/dri_extensions.c
diff --git a/src/gallium/state_trackers/glx/dri1/dri_lock.c b/src/gallium/state_trackers/glx/dri/dri_lock.c
similarity index 100%
rename from src/gallium/state_trackers/glx/dri1/dri_lock.c
rename to src/gallium/state_trackers/glx/dri/dri_lock.c
diff --git a/src/gallium/state_trackers/glx/dri1/dri_screen.c b/src/gallium/state_trackers/glx/dri/dri_screen.c
similarity index 100%
rename from src/gallium/state_trackers/glx/dri1/dri_screen.c
rename to src/gallium/state_trackers/glx/dri/dri_screen.c
diff --git a/src/gallium/state_trackers/glx/dri1/dri_screen.h b/src/gallium/state_trackers/glx/dri/dri_screen.h
similarity index 100%
rename from src/gallium/state_trackers/glx/dri1/dri_screen.h
rename to src/gallium/state_trackers/glx/dri/dri_screen.h
diff --git a/src/gallium/state_trackers/glx/dri1/dri_swapbuffers.c b/src/gallium/state_trackers/glx/dri/dri_swapbuffers.c
similarity index 100%
rename from src/gallium/state_trackers/glx/dri1/dri_swapbuffers.c
rename to src/gallium/state_trackers/glx/dri/dri_swapbuffers.c
diff --git a/src/gallium/state_trackers/glx/dri1/dri_swapbuffers.h b/src/gallium/state_trackers/glx/dri/dri_swapbuffers.h
similarity index 100%
rename from src/gallium/state_trackers/glx/dri1/dri_swapbuffers.h
rename to src/gallium/state_trackers/glx/dri/dri_swapbuffers.h